Author: sebb Date: Fri Jan 29 15:09:58 2010 New Revision: 904514 URL: http://svn.apache.org/viewvc?rev=904514&view=rev Log: Prevent NPE in askThreadsToStop()
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java 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=904514&r1=904513&r2=904514&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 Fri Jan 29 15:09:58 2010 @@ -578,7 +578,9 @@ } public void askThreadsToStop() { - engine.stopTest(false); + if (engine == null) { // Will be null if StopTest thread has started + engine.stopTest(false); + } } private void stopAllThreads() { --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org