Author: sebb
Date: Mon May 5 18:14:57 2008
New Revision: 653658
URL: http://svn.apache.org/viewvc?rev=653658&view=rev
Log:
More detail when a failure occurs; remove Java 1.3 only code
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java?rev=653658&r1=653657&r2=653658&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java Mon
May 5 18:14:57 2008
@@ -18,6 +18,7 @@
package org.apache.jmeter.junit;
+import java.awt.HeadlessException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -574,20 +575,15 @@
caught = e;
System.out.println("WARN: " + exName +
": IllegalAccessException " + n);
// We won't test restricted-access
classes.
- }
- // JDK1.4: catch (java.awt.HeadlessException e)
- // JDK1.4: {
- // JDK1.4: System.out.println("Error creating
"+n+"
- // "+e.toString());
- // JDK1.4: }
- catch (Exception e) {
+ } catch (HeadlessException e) {
+ caught = e;
+ System.out.println("Error creating "+n+"
"+e.toString());
+ } catch (Exception e) {
caught = e;
- if ((e instanceof RemoteException) ||
e.getClass().getName().equals("java.awt.HeadlessException")// for
-
// JDK1.3
- ) {
+ if (e instanceof RemoteException) { //
not thrown, so need to check here
System.out.println("WARN: " +
"Error creating " + n + " " + e.toString());
} else {
- throw new Exception("Error
creating " + n + " " + e.toString());
+ throw new Exception("Error
creating " + n, e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
