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:26:33 UTC

cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions IterationCounter.java

mstover1    2003/05/20 07:26:33

  Modified:    src/components/org/apache/jmeter/modifiers
                        CounterConfig.java
               src/functions/org/apache/jmeter/functions
                        IterationCounter.java
  Log:
  Simplifying
  
  Revision  Changes    Path
  1.14      +1 -1      jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CounterConfig.java	12 May 2003 20:08:06 -0000	1.13
  +++ CounterConfig.java	20 May 2003 14:26:33 -0000	1.14
  @@ -51,7 +51,7 @@
   		else
   		{		
   			String value = variables.get(getVarName());
  -			if(value == null || value.equals(""))
  +			if(value == null)
   			{
   				variables.put(getVarName(),Integer.toString(start));
                   value = variables.get(getVarName());
  
  
  
  1.9       +4 -27     jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java
  
  Index: IterationCounter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- IterationCounter.java	12 May 2003 20:09:02 -0000	1.8
  +++ IterationCounter.java	20 May 2003 14:26:33 -0000	1.9
  @@ -24,12 +24,12 @@
   	}
   	
   	private Object[] variables;
  -	private IntegerWrapper counter;
  +	private int[] counter;
   
   
   	public IterationCounter()
   	{
  -		counter = new IntegerWrapper(new Integer(0));
  +		counter = new int[1];
   	}
   	
   	public Object clone()
  @@ -45,7 +45,7 @@
   	public synchronized String execute(SampleResult previousResult, Sampler currentSampler)
   		throws InvalidVariableException 
   	{
  -		counter.setInteger((new Integer(counter.getInteger().intValue()+1)));
  +		counter[0]++;
   
   		JMeterVariables vars = getVariables();
   		
  @@ -60,7 +60,7 @@
   		}
   		else
   		{
  -			counterString = String.valueOf(counter.getInteger());
  +			counterString = String.valueOf(counter[0]);
   		}
   		
   		vars.put( varName, counterString );
  @@ -93,29 +93,6 @@
   	 */
   	public List getArgumentDesc() {
   		return desc;
  -	}
  -	
  -	protected class IntegerWrapper
  -		implements Serializable
  -	{
  -		Integer i;
  -
  -		public IntegerWrapper() {}
  -	
  -		public IntegerWrapper(Integer i)
  -		{
  -			this.i = i;
  -		}
  -	
  -		public void setInteger(Integer i)
  -		{
  -			this.i = i;
  -		}
  -	
  -		public Integer getInteger()
  -		{
  -			return i;
  -		}
   	}
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org