You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/06/28 22:13:35 UTC
svn commit: r1688054 - in
/jmeter/trunk/src/core/org/apache/jmeter/save/converters:
SampleResultConverter.java TestElementConverter.java
TestElementPropertyConverter.java
Author: pmouawad
Date: Sun Jun 28 20:13:35 2015
New Revision: 1688054
URL: http://svn.apache.org/r1688054
Log:
Java7 multiple exception catching
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1688054&r1=1688053&r2=1688054&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Sun Jun 28 20:13:35 2015
@@ -469,8 +469,6 @@ public class SampleResultConverter exten
}
outstream.close();
res.setResponseData(outstream.toByteArray());
- } catch (FileNotFoundException e) {
- log.warn(e.getLocalizedMessage());
} catch (IOException e) {
log.warn(e.getLocalizedMessage());
} finally {
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1688054&r1=1688053&r2=1688054&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Sun Jun 28 20:13:35 2015
@@ -113,10 +113,7 @@ public class TestElementConverter extend
reader.moveUp();
}
return el;
- } catch (InstantiationException e) {
- log.error("TestElement not instantiable: " + type, e);
- return null;
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException|IllegalAccessException e) {
log.error("TestElement not instantiable: " + type, e);
return null;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1688054&r1=1688053&r2=1688054&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java Sun Jun 28 20:13:35 2015
@@ -128,10 +128,7 @@ public class TestElementPropertyConverte
reader.moveUp();
}
return prop;
- } catch (InstantiationException e) {
- log.error("Couldn't unmarshall TestElementProperty", e);
- return new TestElementProperty("ERROR", new ConfigTestElement());// $NON-NLS-1$
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException|IllegalAccessException e) {
log.error("Couldn't unmarshall TestElementProperty", e);
return new TestElementProperty("ERROR", new ConfigTestElement());// $NON-NLS-1$
}