Author: sebb
Date: Sat Feb 13 17:20:55 2016
New Revision: 1730255
URL: http://svn.apache.org/viewvc?rev=1730255&view=rev
Log:
Revert r1730205 as it results in duplicate information in the log file
Bugzilla Id: 58987
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=1730255&r1=1730254&r2=1730255&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sat Feb 13 17:20:55 2016
@@ -310,7 +310,6 @@ public class JMeter implements JMeterPlu
}
try {
initializeProperties(parser); // Also initialises JMeter logging
-
/*
* The following is needed for HTTPClient.
* (originally tried doing this in HTTPSampler2,
@@ -435,7 +434,7 @@ public class JMeter implements JMeterPlu
System.out.println("Incorrect Usage");
System.out.println(CLUtil.describeOptions(options).toString());
} catch (Throwable e) {
- log.fatalError("An error occurred: "+e.getMessage(),e);
+ log.fatalError("An error occurred: ",e);
System.out.println("An error occurred: " + e.getMessage());
System.exit(1); // TODO - could this be return?
}