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/27 16:24:46 UTC
svn commit: r1687934 -
/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Author: pmouawad
Date: Sat Jun 27 14:24:46 2015
New Revision: 1687934
URL: http://svn.apache.org/r1687934
Log:
Java7 multiple exception catching
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1687934&r1=1687933&r2=1687934&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Sat Jun 27 14:24:46 2015
@@ -178,9 +178,7 @@ public class SyncTimer extends AbstractT
} else {
throw new IllegalArgumentException("Negative value for timeout:"+timeoutInMs+" in Synchronizing Timer "+getName());
}
- } catch (InterruptedException e) {
- return 0;
- } catch (BrokenBarrierException e) {
+ } catch (InterruptedException|BrokenBarrierException e) {
return 0;
} catch (TimeoutException e) {
LOGGER.warn("SyncTimer "+ getName() + " timeouted waiting for users after:"+getTimeoutInMs()+"ms");