sebb 2004/01/30 08:06:24
Modified: src/core/org/apache/jmeter/util JMeterUtils.java
Log:
More detailed log message
Revision Changes Path
1.60 +22 -6 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- JMeterUtils.java 30 Jan 2004 11:26:42 -0000 1.59
+++ JMeterUtils.java 30 Jan 2004 16:06:24 -0000 1.60
@@ -951,11 +951,27 @@
errorMsg = "Unknown error - see log file";
log.warn("Unknown error", new Throwable("errorMsg == null"));
}
- JOptionPane.showMessageDialog(
- GuiPackage.getInstance().getMainFrame(),
- errorMsg,
- "Error",
- JOptionPane.ERROR_MESSAGE);
+ try
+ {
+ JOptionPane.showMessageDialog(
+ GuiPackage.getInstance().getMainFrame(),
+ errorMsg,
+ "Error",
+ JOptionPane.ERROR_MESSAGE);
+ }
+ catch (RuntimeException e)
+ {
+ if (e.getClass().getName().equals("java.awt.HeadlessException"))
//JDK1.4:
+ {
+ //System.out.println(errorMsg+"[HeadlessException]");
+ //throw e;
+ log.warn("reportErrorToUser(\""+errorMsg+"\")
caused",e);
+ }
+ else
+ {
+ throw e;
+ }
+ }
}
/**
* Finds a string in an array of strings and returns the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
