sebb 2004/09/25 13:56:51
Modified: src/core/org/apache/jmeter/engine Tag: rel-2_0
StandardJMeterEngine.java
Log:
Fix possible NPE
Revision Changes Path
No revision
No revision
1.43.2.6 +4 -2
jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -u -r1.43.2.5 -r1.43.2.6
--- StandardJMeterEngine.java 21 Sep 2004 20:22:40 -0000 1.43.2.5
+++ StandardJMeterEngine.java 25 Sep 2004 20:56:51 -0000 1.43.2.6
@@ -74,10 +74,12 @@
private static Map allThreadsSave;
public static void stopEngineNow()
{
+ if (engine != null) // May be null if called from Unit test
engine.stopTest();
}
public static void stopEngine()
{
+ if (engine != null) // May be null if called from Unit test
engine.askThreadsToStop();
}
public static boolean stopThread(String threadName)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]