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 se...@apache.org on 2004/12/16 00:34:44 UTC

cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/engine StandardJMeterEngine.java

sebb        2004/12/15 15:34:44

  Modified:    src/core/org/apache/jmeter/engine Tag: rel-2_0
                        StandardJMeterEngine.java
  Log:
  Force start-time to now if already passed - so delay works OK
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.43.2.9  +8 -6      jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
  
  Index: StandardJMeterEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
  retrieving revision 1.43.2.8
  retrieving revision 1.43.2.9
  diff -u -r1.43.2.8 -r1.43.2.9
  --- StandardJMeterEngine.java	12 Oct 2004 23:45:21 -0000	1.43.2.8
  +++ StandardJMeterEngine.java	15 Dec 2004 23:34:42 -0000	1.43.2.9
  @@ -23,7 +23,6 @@
   import java.io.StringWriter;
   import java.util.ArrayList;
   import java.util.Collection;
  -import java.util.Date;
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.Iterator;
  @@ -468,11 +467,14 @@
           //if true the Scheduler is enabled
           if (group.getScheduler())
           {
  -			//set the starttime for the Thread
  +        	long now = System.currentTimeMillis();
  +			//set the start time for the Thread
           	if (group.getDelay() > 0 ){// Duration is  in seconds
  -				thread.setStartTime(group.getDelay()*1000+(new Date().getTime()));
  +				thread.setStartTime(group.getDelay()*1000+now);
           	} else {
  -				thread.setStartTime(group.getStartTime());
  +        		long start = group.getStartTime();
  +        		if (start < now) start = now; // Force a sensible start time
  +				thread.setStartTime(start);
           	}
               
   			//set the endtime for the Thread
  
  
  

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