svn commit: r1758348 - /jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Aug 30 09:26:05 2016
New Revision: 1758348

URL: http://svn.apache.org/viewvc?rev=1758348&view=rev
Log:
Bug 60049 - When using Timers with high delays or Constant Throughput Timer with low throughput, Scheduler may take a lot of time to exit, same for Shutdown test 
Comment code
Bugzilla Id: 60049

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

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1758348&r1=1758347&r2=1758348&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Tue Aug 30 09:26:05 2016
@@ -800,6 +800,8 @@ public class JMeterThread implements Run
         if (totalDelay > 0) {
             try {
                 if(scheduler) {
+                    // We reduce pause to ensure end of test is not delayed by a sleep ending after test scheduled end
+                    // See Bug 60049
                     long now = System.currentTimeMillis();
                     if(now + totalDelay > endTime) {
                         totalDelay = endTime - now;