You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jmeter.apache.org by Philippe Mouawad <ph...@gmail.com> on 2014/12/24 15:11:44 UTC

Re: svn commit: r1647416 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/JMeterThread.java src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java xdocs/changes.xml

Hi,
Wrong bug id was used, should have been 57385.
Regards

On Mon, Dec 22, 2014 at 10:36 PM, <se...@apache.org> wrote:

> Author: sebb
> Date: Mon Dec 22 21:36:46 2014
> New Revision: 1647416
>
> URL: http://svn.apache.org/r1647416
> Log:
> Getting empty thread name in xml result for HTTP requests with "Follow
> Redirects" set
> Bugzilla Id: 57835
>
> Modified:
>     jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
>
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>     jmeter/trunk/xdocs/changes.xml
>
> 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=1647416&r1=1647415&r2=1647416&view=diff
>
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Mon
> Dec 22 21:36:46 2014
> @@ -437,6 +437,14 @@ public class JMeterThread implements Run
>
>  result.setGroupThreads(threadGroup.getNumberOfThreads());
>
>  result.setAllThreads(JMeterContextService.getNumberOfThreads());
>                      result.setThreadName(threadName);
> +                    SampleResult[]subResults = result.getSubResults();
> +                    if(subResults != null) {
> +                        for (SampleResult subResult : subResults) {
> +
> subResult.setGroupThreads(threadGroup.getNumberOfThreads());
> +
> subResult.setAllThreads(JMeterContextService.getNumberOfThreads());
> +                            subResult.setThreadName(threadName);
> +                        }
> +                    }
>                      threadContext.setPreviousResult(result);
>                      runPostProcessors(pack.getPostProcessors());
>                      checkAssertions(pack.getAssertions(), result,
> threadContext);
>
> Modified:
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> URL:
> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1647416&r1=1647415&r2=1647416&view=diff
>
> ==============================================================================
> ---
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> (original)
> +++
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> Mon Dec 22 21:36:46 2014
> @@ -54,8 +54,8 @@ import org.apache.jmeter.protocol.http.c
>  import org.apache.jmeter.protocol.http.control.CacheManager;
>  import org.apache.jmeter.protocol.http.control.Cookie;
>  import org.apache.jmeter.protocol.http.control.CookieManager;
> -import org.apache.jmeter.protocol.http.control.HeaderManager;
>  import org.apache.jmeter.protocol.http.control.DNSCacheManager;
> +import org.apache.jmeter.protocol.http.control.HeaderManager;
>  import org.apache.jmeter.protocol.http.parser.HTMLParseException;
>  import org.apache.jmeter.protocol.http.parser.HTMLParser;
>  import org.apache.jmeter.protocol.http.util.ConversionUtils;
> @@ -1206,9 +1206,6 @@ public abstract class HTTPSamplerBase ex
>          // Iterate through the URLs and download each image:
>          if (urls != null && urls.hasNext()) {
>              if (container == null) {
> -                // TODO needed here because currently done on sample
> completion in JMeterThread,
> -                // but that only catches top-level samples.
> -                res.setThreadName(Thread.currentThread().getName());
>                  container = new HTTPSampleResult(res);
>                  container.addRawSubResult(res);
>              }
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL:
> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1647416&r1=1647415&r2=1647416&view=diff
>
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Mon Dec 22 21:36:46 2014
> @@ -140,6 +140,7 @@ See  <bugzilla>56357</bugzilla> for deta
>
>  <h3>HTTP Samplers and Test Script Recorder</h3>
>  <ul>
> +<li><bug>57835</bug>Getting empty thread name in xml result for HTTP
> requests with "Follow Redirects" set</li>
>  </ul>
>
>  <h3>Other Samplers</h3>
>
>
>


-- 
Cordialement.
Philippe Mouawad.

Re: svn commit: r1647416 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/JMeterThread.java src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java xdocs/changes.xml

Posted by sebb <se...@gmail.com>.
Good catch; fixed the log messages

On 24 December 2014 at 14:11, Philippe Mouawad
<ph...@gmail.com> wrote:
> Hi,
> Wrong bug id was used, should have been 57385.
> Regards
>
> On Mon, Dec 22, 2014 at 10:36 PM, <se...@apache.org> wrote:
>
>> Author: sebb
>> Date: Mon Dec 22 21:36:46 2014
>> New Revision: 1647416
>>
>> URL: http://svn.apache.org/r1647416
>> Log:
>> Getting empty thread name in xml result for HTTP requests with "Follow
>> Redirects" set
>> Bugzilla Id: 57835
>>
>> Modified:
>>     jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
>>
>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>>     jmeter/trunk/xdocs/changes.xml
>>
>> 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=1647416&r1=1647415&r2=1647416&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
>> (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Mon
>> Dec 22 21:36:46 2014
>> @@ -437,6 +437,14 @@ public class JMeterThread implements Run
>>
>>  result.setGroupThreads(threadGroup.getNumberOfThreads());
>>
>>  result.setAllThreads(JMeterContextService.getNumberOfThreads());
>>                      result.setThreadName(threadName);
>> +                    SampleResult[]subResults = result.getSubResults();
>> +                    if(subResults != null) {
>> +                        for (SampleResult subResult : subResults) {
>> +
>> subResult.setGroupThreads(threadGroup.getNumberOfThreads());
>> +
>> subResult.setAllThreads(JMeterContextService.getNumberOfThreads());
>> +                            subResult.setThreadName(threadName);
>> +                        }
>> +                    }
>>                      threadContext.setPreviousResult(result);
>>                      runPostProcessors(pack.getPostProcessors());
>>                      checkAssertions(pack.getAssertions(), result,
>> threadContext);
>>
>> Modified:
>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1647416&r1=1647415&r2=1647416&view=diff
>>
>> ==============================================================================
>> ---
>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>> (original)
>> +++
>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>> Mon Dec 22 21:36:46 2014
>> @@ -54,8 +54,8 @@ import org.apache.jmeter.protocol.http.c
>>  import org.apache.jmeter.protocol.http.control.CacheManager;
>>  import org.apache.jmeter.protocol.http.control.Cookie;
>>  import org.apache.jmeter.protocol.http.control.CookieManager;
>> -import org.apache.jmeter.protocol.http.control.HeaderManager;
>>  import org.apache.jmeter.protocol.http.control.DNSCacheManager;
>> +import org.apache.jmeter.protocol.http.control.HeaderManager;
>>  import org.apache.jmeter.protocol.http.parser.HTMLParseException;
>>  import org.apache.jmeter.protocol.http.parser.HTMLParser;
>>  import org.apache.jmeter.protocol.http.util.ConversionUtils;
>> @@ -1206,9 +1206,6 @@ public abstract class HTTPSamplerBase ex
>>          // Iterate through the URLs and download each image:
>>          if (urls != null && urls.hasNext()) {
>>              if (container == null) {
>> -                // TODO needed here because currently done on sample
>> completion in JMeterThread,
>> -                // but that only catches top-level samples.
>> -                res.setThreadName(Thread.currentThread().getName());
>>                  container = new HTTPSampleResult(res);
>>                  container.addRawSubResult(res);
>>              }
>>
>> Modified: jmeter/trunk/xdocs/changes.xml
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1647416&r1=1647415&r2=1647416&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/xdocs/changes.xml (original)
>> +++ jmeter/trunk/xdocs/changes.xml Mon Dec 22 21:36:46 2014
>> @@ -140,6 +140,7 @@ See  <bugzilla>56357</bugzilla> for deta
>>
>>  <h3>HTTP Samplers and Test Script Recorder</h3>
>>  <ul>
>> +<li><bug>57835</bug>Getting empty thread name in xml result for HTTP
>> requests with "Follow Redirects" set</li>
>>  </ul>
>>
>>  <h3>Other Samplers</h3>
>>
>>
>>
>
>
> --
> Cordialement.
> Philippe Mouawad.