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 2016/04/01 08:42:57 UTC
svn commit: r1737311 - in /jmeter/trunk/src/core/org/apache/jmeter:
JMeter.java jmeter_as_ascii_art.txt
Author: pmouawad
Date: Fri Apr 1 06:42:57 2016
New Revision: 1737311
URL: http://svn.apache.org/viewvc?rev=1737311&view=rev
Log:
Fix NPE
Remove version from Ascii art
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
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=1737311&r1=1737310&r2=1737311&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Apr 1 06:42:57 2016
@@ -363,7 +363,7 @@ public class JMeter implements JMeterPlu
*/
public void start(String[] args) {
- try (InputStream inputStream = getClass().getResourceAsStream("/org/apache/jmeter/jmeter_as_ascii_art.txt")) {
+ try (InputStream inputStream = JMeter.class.getResourceAsStream("/org/apache/jmeter/jmeter_as_ascii_art.txt")) {
String text = IOUtils.toString(inputStream);
System.out.println(text);
} catch (IOException e1) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt?rev=1737311&r1=1737310&r2=1737311&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt Fri Apr 1 06:42:57 2016
@@ -1,5 +1,5 @@
- _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____ _____ ___
- / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \ |___ / / _ \
- / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) | |_ \| | | |
- / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ < ___) | |_| |
-/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\ |____(_)___/
+ _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____
+ / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \
+ / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) |
+ / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ <
+/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\