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

(-)src/core/org/apache/jmeter/threads/JMeterThread.java (+8 lines)
Lines 437-442 Link Here
437
                    result.setGroupThreads(threadGroup.getNumberOfThreads());
437
                    result.setGroupThreads(threadGroup.getNumberOfThreads());
438
                    result.setAllThreads(JMeterContextService.getNumberOfThreads());
438
                    result.setAllThreads(JMeterContextService.getNumberOfThreads());
439
                    result.setThreadName(threadName);
439
                    result.setThreadName(threadName);
440
                    SampleResult[]subResults = result.getSubResults();
441
                    if(subResults != null) {
442
                        for (SampleResult subResult : subResults) {
443
                            subResult.setGroupThreads(threadGroup.getNumberOfThreads());
444
                            subResult.setAllThreads(JMeterContextService.getNumberOfThreads());
445
                            subResult.setThreadName(threadName);
446
                        }
447
                    }
440
                    threadContext.setPreviousResult(result);
448
                    threadContext.setPreviousResult(result);
441
                    runPostProcessors(pack.getPostProcessors());
449
                    runPostProcessors(pack.getPostProcessors());
442
                    checkAssertions(pack.getAssertions(), result, threadContext);
450
                    checkAssertions(pack.getAssertions(), result, threadContext);
(-)src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (-4 / +1 lines)
Lines 54-61 Link Here
54
import org.apache.jmeter.protocol.http.control.CacheManager;
54
import org.apache.jmeter.protocol.http.control.CacheManager;
55
import org.apache.jmeter.protocol.http.control.Cookie;
55
import org.apache.jmeter.protocol.http.control.Cookie;
56
import org.apache.jmeter.protocol.http.control.CookieManager;
56
import org.apache.jmeter.protocol.http.control.CookieManager;
57
import org.apache.jmeter.protocol.http.control.HeaderManager;
58
import org.apache.jmeter.protocol.http.control.DNSCacheManager;
57
import org.apache.jmeter.protocol.http.control.DNSCacheManager;
58
import org.apache.jmeter.protocol.http.control.HeaderManager;
59
import org.apache.jmeter.protocol.http.parser.HTMLParseException;
59
import org.apache.jmeter.protocol.http.parser.HTMLParseException;
60
import org.apache.jmeter.protocol.http.parser.HTMLParser;
60
import org.apache.jmeter.protocol.http.parser.HTMLParser;
61
import org.apache.jmeter.protocol.http.util.ConversionUtils;
61
import org.apache.jmeter.protocol.http.util.ConversionUtils;
Lines 1206-1214 Link Here
1206
        // Iterate through the URLs and download each image:
1206
        // Iterate through the URLs and download each image:
1207
        if (urls != null && urls.hasNext()) {
1207
        if (urls != null && urls.hasNext()) {
1208
            if (container == null) {
1208
            if (container == null) {
1209
                // TODO needed here because currently done on sample completion in JMeterThread,
1210
                // but that only catches top-level samples.
1211
                res.setThreadName(Thread.currentThread().getName());
1212
                container = new HTTPSampleResult(res);
1209
                container = new HTTPSampleResult(res);
1213
                container.addRawSubResult(res);
1210
                container.addRawSubResult(res);
1214
            }
1211
            }

Return to bug 57385