Author: milamber
Date: Tue Sep 13 23:33:42 2011
New Revision: 1170388
URL: http://svn.apache.org/viewvc?rev=1170388&view=rev
Log:
If Controller - Fixed a regression introduce by bug 50032
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=50032#c6
and https://issues.apache.org/bugzilla/show_bug.cgi?id=50618#c28
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1170388&r1=1170387&r2=1170388&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
Tue Sep 13 23:33:42 2011
@@ -226,8 +226,9 @@ public class GenericController extends A
if (currentElement instanceof Sampler) {
nextIsASampler((Sampler) currentElement);
} else { // must be a controller
- nextIsAController((Controller) currentElement);
- reInitializeSubController();
+ if (nextIsAController((Controller) currentElement) !=
null) {
+ reInitializeSubController();
+ }
}
}
} catch (NextIsNullException e) {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1170388&r1=1170387&r2=1170388&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Sep 13 23:33:42 2011
@@ -81,6 +81,7 @@ This can be overridden by setting the JM
<h3>Controllers</h3>
<ul>
+<li>If Controller - Fixed a regression introduce by bug 50032 (see bug 50618
too)</li>
</ul>
<h3>Listeners</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
