Author: sebb
Date: Tue Sep 27 09:13:51 2011
New Revision: 1176291
URL: http://svn.apache.org/viewvc?rev=1176291&view=rev
Log:
Release the interrupt lock to allow late interrupts to complete
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
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=1176291&r1=1176290&r2=1176291&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 Sep 27 09:13:51 2011
@@ -307,12 +307,13 @@ public class JMeterThread implements Run
log.error("Test failed!", e);
} finally {
currentSampler = null; // prevent any further interrupts
- interruptLock.lock(); // make sure current interrupt is finished
+ interruptLock.lock(); // make sure current interrupt is finished,
prevent another starting yet
threadContext.clear();
log.info("Thread finished: " + threadName);
threadFinished(iterationListener);
monitor.threadFinished(this); // Tell the engine we are done
JMeterContextService.removeContext(); // Remove the ThreadLocal
entry
+ interruptLock.unlock(); // Allow any pending interrupt to complete
(OK because currentSampler == null)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
