jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1379969 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
Date Sun, 02 Sep 2012 13:50:47 GMT
Author: pmouawad
Date: Sun Sep  2 13:50:47 2012
New Revision: 1379969

URL: http://svn.apache.org/viewvc?rev=1379969&view=rev
Log:
log cannot be null

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1379969&r1=1379968&r2=1379969&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Sep  2 13:50:47 2012
@@ -392,11 +392,7 @@ public class JMeter implements JMeterPlu
             System.out.println("Incorrect Usage");
             System.out.println(CLUtil.describeOptions(options).toString());
         } catch (Throwable e) {
-            if (log != null){
-                log.fatalError("An error occurred: ",e);
-            } else {
-                e.printStackTrace();
-            }
+            log.fatalError("An error occurred: ",e);
             System.out.println("An error occurred: " + e.getMessage());
             System.exit(1); // TODO - could this be return?
         }



Mime
View raw message