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:44 UTC
svn commit: r1688058 -
/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Author: pmouawad
Date: Sun Jun 28 20:15:43 2015
New Revision: 1688058
URL: http://svn.apache.org/r1688058
Log:
Java7 multiple exception catching
Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1688058&r1=1688057&r2=1688058&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Sun Jun 28 20:15:43 2015
@@ -404,17 +404,10 @@ public class ResultCollector extends Abs
}
}
}
- } catch (IOException e) {
+ } catch (IOException|JMeterError|RuntimeException|OutOfMemoryError e) {
+ // FIXME Why do we catch OOM ?
log.warn("Problem reading JTL file: "+file);
- } catch (JMeterError e){
- log.warn("Problem reading JTL file: "+file);
- } catch (RuntimeException e){ // e.g. NullPointerException
- log.warn("Problem reading JTL file: "+file,e);
- } catch (OutOfMemoryError e) {
- log.warn("Problem reading JTL file: "+file,e);
- } catch (ConfigurationException e) { // Avalon only
- log.warn("Problem reading Avalon JTL file: "+file,e);
- } catch (SAXException e) { // Avalon only
+ } catch (ConfigurationException|SAXException e) { // Avalon only
log.warn("Problem reading Avalon JTL file: "+file,e);
} finally {
JOrphanUtils.closeQuietly(dataReader);