Author: sebb
Date: Sat Nov 12 11:18:30 2005
New Revision: 332821
URL: http://svn.apache.org/viewcvs?rev=332821&view=rev
Log:
Improved error messages when script loading fails
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java?rev=332821&r1=332820&r2=332821&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
(original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java Sat
Nov 12 11:18:30 2005
@@ -77,6 +77,8 @@
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
+import com.thoughtworks.xstream.converters.ConversionException;
+
/**
* @author mstover
*/
@@ -206,6 +208,9 @@
GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
new Load().insertLoadedTree(1, tree);
+ } catch (ConversionException e) {
+ log.error("Failure loading test file", e);
+ JMeterUtils.reportErrorToUser(SaveService.CEtoString(e));
} catch (Exception e) {
log.error("Failure loading test file", e);
JMeterUtils.reportErrorToUser(e.toString());
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java?rev=332821&r1=332820&r2=332821&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
Sat Nov 12 11:18:30 2005
@@ -42,6 +42,7 @@
import org.apache.log.Logger;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.ConversionException;
/**
* @author Michael Stover
@@ -95,17 +96,20 @@
}
} catch (NoClassDefFoundError ex) // Allow for missing optional
jars
{
+ log.warn("Missing jar file", ex);
String msg = ex.getMessage();
if (msg == null) {
msg = "Missing jar file - see log for details";
- log.warn("Missing jar file", ex);
}
JMeterUtils.reportErrorToUser(msg);
+ } catch (ConversionException ex) {
+ log.warn("Could not convert file "+ex);
+ JMeterUtils.reportErrorToUser(SaveService.CEtoString(ex));
} catch (Exception ex) {
+ log.warn("Unexpected error", ex);
String msg = ex.getMessage();
if (msg == null) {
msg = "Unexpected error - see log for details";
- log.warn("Unexpected error", ex);
}
JMeterUtils.reportErrorToUser(msg);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
