You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by mi...@apache.org on 2011/01/21 09:24:47 UTC
svn commit: r1061679 - in
/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control:
GenericController.java IfController.java
Author: milamber
Date: Fri Jan 21 08:24:47 2011
New Revision: 1061679
URL: http://svn.apache.org/viewvc?rev=1061679&view=rev
Log:
No need to return a value (improving patch Bug 50032)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
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=1061679&r1=1061678&r2=1061679&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 Fri Jan 21 08:24:47 2011
@@ -218,23 +218,20 @@ public class GenericController extends A
/**
* Called to re-initialize a index of controller's elements (Bug 50032)
*
- * @return Sampler
*/
- protected Sampler reInitializeSubController() {
- Sampler returnValue = null;
+ protected void reInitializeSubController() {
try {
TestElement currentElement = getCurrentElement();
if (currentElement != null) {
if (currentElement instanceof Sampler) {
- returnValue = nextIsASampler((Sampler) currentElement);
+ nextIsASampler((Sampler) currentElement);
} else { // must be a controller
- returnValue = nextIsAController((Controller) currentElement);
+ nextIsAController((Controller) currentElement);
reInitializeSubController();
}
}
} catch (NextIsNullException e) {
}
- return returnValue;
}
/**
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1061679&r1=1061678&r2=1061679&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Fri Jan 21 08:24:47 2011
@@ -168,8 +168,9 @@ public class IfController extends Generi
if (result) {
return super.next();
}
+ // If-test is false, need to re-initialize indexes
try {
- super.reInitializeSubController(); // Bug 50032 - reinitialize current index element for all sub controller
+ reInitializeSubController(); // Bug 50032 - reinitialize current index element for all sub controller
return nextIsNull();
} catch (NextIsNullException e1) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org