View | Details | Raw Unified | Return to bug 63490
Collapse All | Expand All

(-)src/core/org/apache/jmeter/threads/JMeterThread.java (-4 / +5 lines)
Lines 951-960 Link Here
951
        }
951
        }
952
        if (totalDelay > 0) {
952
        if (totalDelay > 0) {
953
            try {
953
            try {
954
                if (scheduler) {
954
                // Stop test for this thread, if duration of schedule would end with the delay
955
                    // We reduce pause to ensure end of test is not delayed by a sleep ending after test scheduled end
955
                // See Bug 60049 and 63490
956
                    // See Bug 60049
956
                if (scheduler && endTime - totalDelay <= System.currentTimeMillis()) {
957
                    totalDelay = TIMER_SERVICE.adjustDelay(totalDelay, endTime);
957
                    running = false;
958
                    return;
958
                }
959
                }
959
                TimeUnit.MILLISECONDS.sleep(totalDelay);
960
                TimeUnit.MILLISECONDS.sleep(totalDelay);
960
            } catch (InterruptedException e) {
961
            } catch (InterruptedException e) {

Return to bug 63490