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:15:12 UTC

svn commit: r1688057 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java

Author: pmouawad
Date: Sun Jun 28 20:15:11 2015
New Revision: 1688057

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

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java?rev=1688057&r1=1688056&r2=1688057&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java Sun Jun 28 20:15:11 2015
@@ -107,9 +107,7 @@ public class DiskStoreSampleSender exten
             }                    
         } catch (EOFException err) {
             // expected
-        } catch (IOException err) {
-            log.error("returning sample", err);
-        } catch (ClassNotFoundException err) {
+        } catch (IOException|ClassNotFoundException err) {
             log.error("returning sample", err);
         } finally {
             try {