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/20 16:17:05 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/threads JMeterThread.java JMeterVariables.java
mstover1 2003/05/20 07:17:05
Modified: src/core/org/apache/jmeter/control GenericController.java
src/core/org/apache/jmeter/engine/util SimpleVariable.java
src/core/org/apache/jmeter/threads JMeterThread.java
JMeterVariables.java
Log:
Fixing bugs
Revision Changes Path
1.17 +6 -3 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- GenericController.java 2 May 2003 21:50:54 -0000 1.16
+++ GenericController.java 20 May 2003 14:17:05 -0000 1.17
@@ -88,7 +88,7 @@
public class GenericController extends AbstractTestElement implements Controller, Serializable
{
protected static Logger log = LoggingManager.getLoggerFor(JMeterUtils.ELEMENTS);
- protected List iterationListeners = new LinkedList();
+ protected LinkedList iterationListeners = new LinkedList();
protected List subControllersAndSamplers = new ArrayList();
protected int current;
@@ -288,7 +288,10 @@
public void addIterationListener(LoopIterationListener lis)
{
- iterationListeners.add(lis);
+ /* A little hack - add each listener to the start of the list - this ensures that the thread running the show is the first listener and can
+ * modify certain values before other listeners are called.
+ */
+ iterationListeners.addFirst(lis);
}
protected void fireIterEvents()
1.3 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/engine/util/SimpleVariable.java
Index: SimpleVariable.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/SimpleVariable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleVariable.java 14 Mar 2003 00:20:59 -0000 1.2
+++ SimpleVariable.java 20 May 2003 14:17:05 -0000 1.3
@@ -47,7 +47,7 @@
if ( vars != null )
ret = vars.get(name);
- if( ret == null || ret.length() == 0 )
+ if( ret == null)
return "${"+name+"}";
return ret;
1.28 +6 -6 jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JMeterThread.java 16 May 2003 16:58:17 -0000 1.27
+++ JMeterThread.java 20 May 2003 14:17:05 -0000 1.28
@@ -146,6 +146,7 @@
log.info("Thread " + Thread.currentThread().getName() + " started");
controller.initialize();
controller.addIterationListener(new IterationListener());
+ threadContext.setSamplingStarted(true);
while (running)
{
Sampler sam;
@@ -155,10 +156,8 @@
{
threadContext.setCurrentSampler(sam);
SamplePackage pack = compiler.configureSampler(sam);
- delay(pack.getTimers());
- threadContext.setSamplingStarted(true);
+ delay(pack.getTimers());
SampleResult result = pack.getSampler().sample(null);
- threadContext.setSamplingStarted(false);
result.setThreadName(threadName);
result.setTimeStamp(System.currentTimeMillis());
threadContext.setPreviousResult(result);
@@ -180,6 +179,7 @@
}
finally
{
+ threadContext.setSamplingStarted(false);
log.info("Thread " + threadName + " is done");
monitor.threadFinished(this);
}
1.6 +6 -6 jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterVariables.java
Index: JMeterVariables.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterVariables.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterVariables.java 16 Apr 2003 20:15:58 -0000 1.5
+++ JMeterVariables.java 20 May 2003 14:17:05 -0000 1.6
@@ -66,14 +66,14 @@
putAll(vars.variables);
}
+ /**
+ * Returns null values if variable doesn't exist. Users of this must check for null.
+ * @param key
+ * @return
+ */
public String get(String key)
{
- String val = (String) variables.get(key);
- if (val == null)
- {
- return "";
- }
- return val;
+ return (String) variables.get(key);
}
public Object getObject(String key)
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org