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:12:01 UTC
svn commit: r1688052 - in
/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui:
GenericTestBeanCustomizer.java TestBeanGUI.java
Author: pmouawad
Date: Sun Jun 28 20:12:01 2015
New Revision: 1688052
URL: http://svn.apache.org/r1688052
Log:
Java7 multiple exception catching
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1688052&r1=1688051&r2=1688052&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Sun Jun 28 20:12:01 2015
@@ -245,10 +245,7 @@ public class GenericTestBeanCustomizer e
if (editorClass != null) {
try {
propertyEditor = (PropertyEditor) editorClass.newInstance();
- } catch (InstantiationException e) {
- log.error("Can't create property editor.", e);
- throw new Error(e.toString());
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException|IllegalAccessException e) {
log.error("Can't create property editor.", e);
throw new Error(e.toString());
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1688052&r1=1688051&r2=1688052&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Sun Jun 28 20:12:01 2015
@@ -187,10 +187,7 @@ public class TestBeanGUI extends Abstrac
private Customizer createCustomizer() {
try {
return (Customizer) customizerClass.newInstance();
- } catch (InstantiationException e) {
- log.error("Could not instantiate customizer of class " + customizerClass, e);
- throw new Error(e.toString());
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException|IllegalAccessException e) {
log.error("Could not instantiate customizer of class " + customizerClass, e);
throw new Error(e.toString());
}
@@ -226,11 +223,7 @@ public TestElement createTestElement() {
modifyTestElement(element); // put the default values back into the
// new element
return element;
- } catch (InstantiationException e) {
- log.error("Can't create test element", e);
- throw new Error(e.toString()); // Programming error. Don't
- // continue.
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException|IllegalAccessException e) {
log.error("Can't create test element", e);
throw new Error(e.toString()); // Programming error. Don't
// continue.