Author: sebb
Date: Wed Jan 19 12:48:25 2011
New Revision: 1060796

URL: http://svn.apache.org/viewvc?rev=1060796&view=rev
Log:
Mail on userlist reported NPE here - looks like only happens if there are 
network errors, but check anyway

Modified:
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=1060796&r1=1060795&r2=1060796&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 Wed Jan 19 12:48:25 2011
@@ -128,8 +128,13 @@ public class RemoteJMeterEngineImpl exte
     }
 
     public void reset() throws RemoteException {
-        log.info("Reset");
-        backingEngine.reset();
+        // Mail on userlist reported NPE here - looks like only happens if 
there are network errors, but check anyway
+        if (backingEngine != null) {
+            log.info("Reset");
+            backingEngine.reset();
+        } else {
+            log.warn("Backing engine is null, ignoring reset");
+        }
     }
 
     public void stopTest() throws RemoteException {



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

Reply via email to