You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2015/06/01 20:34:13 UTC
svn commit: r1682972 -
/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Author: sebb
Date: Mon Jun 1 18:34:12 2015
New Revision: 1682972
URL: http://svn.apache.org/r1682972
Log:
Update to Java 7
Can now use Multi-Catch
Bugzilla Id: 57981
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1682972&r1=1682971&r2=1682972&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Mon Jun 1 18:34:12 2015
@@ -564,7 +564,6 @@ public class SaveService {
}
return wrapper.testPlan;
} catch (CannotResolveClassException e) {
- // FIXME We switching to JAVA7, use Multi-Catch Exceptions
if (e.getMessage().startsWith("node")) {
log.info("Problem loading XML, trying Avalon format");
reader.reset();
@@ -575,18 +574,12 @@ public class SaveService {
} else {
throw new IllegalArgumentException("Problem loading XML, cannot determine class for element: " + e, e);
}
- } catch (NoClassDefFoundError e) {
+ } catch (ConversionException|NoClassDefFoundError e) {
if(file != null) {
throw new IllegalArgumentException("Problem loading XML from:'"+file.getAbsolutePath()+"', missing class "+e , e);
} else {
throw new IllegalArgumentException("Problem loading XML, missing class "+e , e);
}
- } catch (ConversionException e) {
- if(file != null) {
- throw new IllegalArgumentException("Problem loading XML from:'"+file.getAbsolutePath()+"', conversion error "+e , e);
- } else {
- throw new IllegalArgumentException("Problem loading XML, conversion error "+e , e);
- }
}
}