svn commit: r1776815 - /jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Dec 31 19:04:16 2016
New Revision: 1776815

URL: http://svn.apache.org/viewvc?rev=1776815&view=rev
Log:
sonar : fix squid:S2696 Make the enclosing method "static" or remove this set

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

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1776815&r1=1776814&r2=1776815&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Sat Dec 31 19:04:16 2016
@@ -111,9 +111,23 @@ public class StandardJMeterEngine implem
     public StandardJMeterEngine(String host) {
         this.host = host;
         // Hack to allow external control
-        engine = this;
+        initSingletonEngine(this);
+    }
+    /**
+     * Set the shared engine
+     * @param standardJMeterEngine 
+     */
+    private static void initSingletonEngine(StandardJMeterEngine standardJMeterEngine) {
+        StandardJMeterEngine.engine = standardJMeterEngine; 
     }
     
+    /**
+     * set the shared engine to null
+     */
+    private static void resetSingletonEngine() {
+        StandardJMeterEngine.engine = null;
+    }
+
     public static void stopEngineNow() {
         if (engine != null) {// May be null if called from Unit test
             engine.stopTest(true);
@@ -307,7 +321,7 @@ public class StandardJMeterEngine implem
         @Override
         public void run() {
             running = false;
-            engine = null;
+            resetSingletonEngine();
             if (now) {
                 tellThreadGroupsToStop();
                 pause(10L * countStillActiveThreads());