Author: undera
Date: Tue Feb 23 08:35:56 2016
New Revision: 1731805
URL: http://svn.apache.org/viewvc?rev=1731805&view=rev
Log:
Bug 59008 - Fix Infinite recursion SampleResult on frame depth limit reached
Bugzilla Id: 59008
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/xdocs/changes.xml
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=1731805&r1=1731804&r2=1731805&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
Tue Feb 23 08:35:56 2016
@@ -1634,7 +1634,9 @@ public abstract class HTTPSamplerBase ex
}
if (isImageParser() && (SampleResult.TEXT).equals(res.getDataType())
&& res.isSuccessful()) {
if (frameDepth > MAX_FRAME_DEPTH) {
- res.addSubResult(errorResult(new Exception("Maximum
frame/iframe nesting depth exceeded."), new HTTPSampleResult(res)));
+ HTTPSampleResult errSubResult = new HTTPSampleResult(res);
+ errSubResult.removeSubResults();
+ res.addSubResult(errorResult(new Exception("Maximum
frame/iframe nesting depth exceeded."), errSubResult));
} else {
// Only download page resources if we were not redirected.
// If we were redirected, the page resources have already been
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1731805&r1=1731804&r2=1731805&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Feb 23 08:35:56 2016
@@ -264,6 +264,7 @@ Summary
<li><bug>58861</bug>When clicking on up, down or detail while in a cell of
the argument panel, newly added content is lost. Contributed by Benoit Wiart
(benoit dot wiart at gmail.com)</li>
<li><bug>57935</bug>SSL SNI extension not supported by HttpClient
4.2.6</li>
<li><bug>59044</bug>Http Sampler : It should not be possible to select the
multipart encoding if the method is not POST. Contributed by Benoit Wiart
(benoit dot wiart at gmail.com)</li>
+ <li><bug>59008</bug>Http Sampler: Infinite recursion SampleResult on frame
depth limit reached</li>
</ul>
<h3>Other Samplers</h3>
