Author: sebb
Date: Mon Aug 16 16:29:12 2010
New Revision: 986020

URL: http://svn.apache.org/viewvc?rev=986020&view=rev
Log:
Bug 49734 - Null pointer exception on stop Threads command (Run>Stop)

Modified:
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=986020&r1=986019&r2=986020&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 Mon Aug 16 16:29:12 2010
@@ -539,7 +539,9 @@ public class StandardJMeterEngine implem
                 item.stop(); // set stop flag
                 item.interrupt(); // interrupt sampler if possible
                 Thread t = allThreads.get(item);
-                t.interrupt(); // also interrupt JVM thread
+                if (t != null ) { // Bug 49734
+                    t.interrupt(); // also interrupt JVM thread
+                }
             }
         }
     }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=986020&r1=986019&r2=986020&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Aug 16 16:29:12 2010
@@ -96,6 +96,7 @@ To override the default local language f
 
 <h3>General</h3>
 <ul>
+<li>Bug 49734 - Null pointer exception on stop Threads command (Run>Stop)</li>
 </ul>
 
 <!-- ==================================================== -->



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to