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

(-)src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (-5 / +6 lines)
Lines 352-363 Link Here
352
        public void run() {
352
        public void run() {
353
            running = false;
353
            running = false;
354
            engine = null;
354
            engine = null;
355
            boolean stopped = false;
355
            if (now) {
356
            if (now) {
356
                tellThreadsToStop();
357
                tellThreadsToStop();
357
                pause(10 * allThreads.size());
358
                pause(10 * allThreads.size());
358
                boolean stopped = verifyThreadsStopped();
359
                stopped = verifyThreadsStopped();
359
                if (!stopped) {
360
                if (!stopped) {
360
                    notifyTestListenersOfEnd(testListenersSave);
361
                    if (JMeter.isNonGUI()) {
361
                    if (JMeter.isNonGUI()) {
362
                        exit();
362
                        exit();
363
                    } else {
363
                    } else {
Lines 369-377 Link Here
369
                } // else will be done by threadFinished()
369
                } // else will be done by threadFinished()
370
            } else {
370
            } else {
371
                stopAllThreads();
371
                stopAllThreads();
372
                if (serialized) {
372
            }
373
                    notifyTestListenersOfEnd(testListenersSave);
373
            //  for TGs which run consecutively or when thread don't stop 
374
                }
374
            if (serialized || !stopped) {
375
                notifyTestListenersOfEnd(testListenersSave);
375
            }
376
            }
376
        }
377
        }
377
    }
378
    }

Return to bug 48786