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 2013/10/16 11:36:40 UTC

svn commit: r1532699 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/RemoteStart.java xdocs/changes.xml

Author: pmouawad
Date: Wed Oct 16 09:36:40 2013
New Revision: 1532699

URL: http://svn.apache.org/r1532699
Log:
Bug 55655 - NullPointerException when Remote stopping /shutdown all if one engine did not start correctly
Bugzilla Id: 55655

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=1532699&r1=1532698&r2=1532699&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java Wed Oct 16 09:36:40 2013
@@ -127,7 +127,10 @@ public class RemoteStart extends Abstrac
     private void doRemoteStop(String name, boolean now) {
         GuiPackage.getInstance().getMainFrame().showStoppingMessage(name);
         JMeterEngine engine = remoteEngines.get(name);
-        engine.stopTest(now);
+        // Engine may be null if it has not correctly started
+        if(engine != null) {
+            engine.stopTest(now);
+        }
     }
 
     /**

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1532699&r1=1532698&r2=1532699&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Oct 16 09:36:40 2013
@@ -419,6 +419,7 @@ If you use any plugin or third-party cod
 <li><bugzilla>55572</bugzilla> - Detail popup of parameter does not show a Scrollbar when content exceeds display</li>
 <li><bugzilla>55580</bugzilla> -  Help pane does not scroll to start for &lt;a href="#"&gt; links</li>
 <li><bugzilla>55600</bugzilla> - JSyntaxTextArea : Strange behaviour on first undo</li>
+<li><bugzilla>55655</bugzilla> - NullPointerException when Remote stopping /shutdown all if one engine did not start correctly. Contributed by UBIK Load Pack (support at ubikloadpack.com)</li>
 </ul>
 
 <!-- =================== Improvements =================== -->