mstover1 2003/01/28 13:21:19
Modified: src/components/org/apache/jmeter/control
InterleaveControl.java RandomController.java
src/core/org/apache/jmeter/control GenericController.java
Log:
Fixing bug #16061
Revision Changes Path
1.5 +1 -0
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InterleaveControl.java 29 Dec 2002 14:20:55 -0000 1.4
+++ InterleaveControl.java 28 Jan 2003 21:21:19 -0000 1.5
@@ -81,6 +81,7 @@
***************************************/
public InterleaveControl()
{
+
}
public void initialize()
1.3 +33 -4
jakarta-jmeter/src/components/org/apache/jmeter/control/RandomController.java
Index: RandomController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/RandomController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RandomController.java 20 Sep 2002 18:23:31 -0000 1.2
+++ RandomController.java 28 Jan 2003 21:21:19 -0000 1.3
@@ -58,6 +58,9 @@
import java.io.Serializable;
import java.util.Random;
+import org.apache.jmeter.testelement.ThreadListener;
+import org.apache.jmeter.threads.JMeterVariables;
+
/**
* @author Administrator
*
@@ -66,18 +69,25 @@
*/
public class RandomController
extends InterleaveControl
- implements Serializable
+ implements Serializable,ThreadListener
{
- Random rand;
+ static Random rand = new Random();
public RandomController()
{
- rand = new Random();
+
}
protected void resetCurrent()
{
- current = rand.nextInt(this.getSubControllers().size());
+ if(getSubControllers().size() > 0)
+ {
+ current = rand.nextInt(this.getSubControllers().size());
+ }
+ else
+ {
+ current = 0;
+ }
}
protected void incrementCurrent()
@@ -85,4 +95,23 @@
setInterleave(NEW_STYLE);
current = rand.nextInt(this.getSubControllers().size());
}
+
+
+ /**
+ * @see org.apache.jmeter.testelement.ThreadListener#iterationStarted(int)
+ */
+ public void iterationStarted(int iterationCount)
+ {
+ if(iterationCount == 1)
+ {
+ resetCurrent();
+ }
+ }
+
+ /**
+ * @see
org.apache.jmeter.testelement.ThreadListener#setJMeterVariables(org.apache.jmeter.threads.JMeterVariables)
+ */
+ public void setJMeterVariables(JMeterVariables jmVars)
+ {}
+
}
1.2 +2 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericController.java 29 Dec 2002 15:31:45 -0000 1.1
+++ GenericController.java 28 Jan 2003 21:21:19 -0000 1.2
@@ -98,6 +98,7 @@
***************************************/
public GenericController()
{
+
}
public boolean isNextFirst()
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
