thads       2004/05/05 12:49:03

  Modified:    src/functions/org/apache/jmeter/functions
                        IterationCounter.java
  Log:
  Fix for bug 28751
  
  Revision  Changes    Path
  1.14      +16 -2     
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- IterationCounter.java     10 Feb 2004 00:35:12 -0000      1.13
  +++ IterationCounter.java     5 May 2004 19:49:03 -0000       1.14
  @@ -34,6 +34,7 @@
   
       private static final List desc = new LinkedList();
       private static final String KEY = "__counter";
  +    private static final String perThreadCounter = "perThreadCounter";
   
       static {
           desc.add(JMeterUtils.getResString("iteration_counter_arg_1"));
  @@ -76,7 +77,20 @@
   
           if (perThread)
           {
  -            counterString = Integer.toString(vars.getIteration());
  +//            counterString = Integer.toString(vars.getIteration());
  +             int counterInt;
  +             try
  +                     {
  +                     counterInt = ((Integer) 
vars.getObject(perThreadCounter)).intValue()+1;
  +
  +                     }
  +             catch(NullPointerException e)
  +                     {
  +                     //First Time! Initialize
  +                     counterInt = 1;
  +                     }
  +             vars.putObject(perThreadCounter, new Integer(counterInt));
  +                     counterString = Integer.toString(counterInt);
           }
           else
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to