You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2003/05/01 18:34:58 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/control GenericController.java
mstover1 2003/05/01 09:34:58
Modified: src/components/org/apache/jmeter/control
InterleaveControl.java
src/core/org/apache/jmeter/control GenericController.java
Log:
Revamping internal contoller code
Revision Changes Path
1.14 +3 -3 jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InterleaveControl.java 1 May 2003 15:49:05 -0000 1.13
+++ InterleaveControl.java 1 May 2003 16:34:57 -0000 1.14
@@ -171,7 +171,7 @@
resetCurrent();
if (getStyle() == USE_SUB_CONTROLLERS)
{
- setFirst(true);
+ setFirst(true);
}
return next();
}
@@ -185,7 +185,7 @@
{
searchStart = currentElement;
}
- else if (searchStart == currentElement && !currentReturnedAtLeastOne) // we've gone through the whole list and are now back at the start point of our search.
+ else if (searchStart == currentElement && (!currentReturnedAtLeastOne && getStyle() == USE_SUB_CONTROLLERS)) // we've gone through the whole list and are now back at the start point of our search.
{
throw new NextIsNullException();
}
@@ -200,7 +200,7 @@
{
removeCurrentElement();
}
- else
+ else if(getStyle() == USE_SUB_CONTROLLERS)
{
incrementCurrent();
}
1.12 +3 -2 jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java
Index: GenericController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GenericController.java 1 May 2003 15:49:06 -0000 1.11
+++ GenericController.java 1 May 2003 16:34:58 -0000 1.12
@@ -248,7 +248,7 @@
protected void setCurrentElement(TestElement currentElement) throws NextIsNullException
{}
- protected TestElement getCurrentElement()
+ protected TestElement getCurrentElement() throws NextIsNullException
{
if (current < subControllersAndSamplers.size())
{
@@ -259,6 +259,7 @@
if (subControllersAndSamplers.size() == 0)
{
setDone(true);
+ throw new NextIsNullException();
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org