svn commit: r908129 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads: JMeterContextService.java JMeterThread.java

Author: sebb
Date: Tue Feb  9 17:50:44 2010
New Revision: 908129

URL: http://svn.apache.org/viewvc?rev=908129&view=rev
Log:
Clear JMeterContext ThreadLocal on thread end

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java?rev=908129&r1=908128&r2=908129&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java Tue Feb  9 17:50:44 2010
@@ -57,6 +57,15 @@
     }
 
     /**
+     * Allows the thread Context to be completely cleared.
+     * <br/>
+     * Invokes {@link ThreadLocal#remove()}.
+     */
+    static void removeContext(){ // Currently only used by JMeterThread
+        threadContext.remove();
+    }
+
+    /**
      * Method is called by the JMeterEngine class when a test run is started.
      * Zeroes numberOfActiveThreads.
      * Saves current time in a field and in the JMeter property "TESTSTART.MS"

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=908129&r1=908128&r2=908129&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Tue Feb  9 17:50:44 2010
@@ -268,6 +268,7 @@
             log.info("Thread finished: " + threadName);
             threadFinished();
             monitor.threadFinished(this); // Tell the engine we are done
+            JMeterContextService.removeContext(); // Remove the ThreadLocal entry
         }
     }