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:09:58 UTC

svn commit: r1688048 - /jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java

Author: pmouawad
Date: Sun Jun 28 20:09:58 2015
New Revision: 1688048

URL: http://svn.apache.org/r1688048
Log:
Java7 multiple exception catching

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java?rev=1688048&r1=1688047&r2=1688048&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java Sun Jun 28 20:09:58 2015
@@ -133,9 +133,7 @@ public class DistributedRunner {
                 } else {
                     log.warn("Host not found in list of active engines: " + address);
                 }
-            } catch (IllegalStateException e) {
-                JMeterUtils.reportErrorToUser(e.getMessage(), JMeterUtils.getResString("remote_error_starting")); // $NON-NLS-1$
-            } catch (JMeterEngineException e) {
+            } catch (IllegalStateException|JMeterEngineException e) {
                 JMeterUtils.reportErrorToUser(e.getMessage(), JMeterUtils.getResString("remote_error_starting")); // $NON-NLS-1$
             }
         }