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 2003/10/05 02:14:47 UTC

cvs commit: jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test JavaTest.java

sebb        2003/10/04 17:14:47

  Modified:    src/protocol/java/org/apache/jmeter/protocol/java/test
                        JavaTest.java
  Log:
  Ensure sampler fields are populated even if interrupted
  
  Revision  Changes    Path
  1.6       +26 -26    jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
  
  Index: JavaTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JavaTest.java	25 Jun 2003 20:33:37 -0000	1.5
  +++ JavaTest.java	5 Oct 2003 00:14:47 -0000	1.6
  @@ -318,42 +318,42 @@
   
           SampleResult results = new SampleResult();
   
  -        try
  -        {
  -            // Record sample start time.
  -            long start = System.currentTimeMillis();
  +		results.setResponseCode(responseCode);
  +		results.setResponseMessage(responseMessage);
  +		results.setSampleLabel(label);
  +
  +		if (samplerData != null && samplerData.length() > 0)
  +		{
  +			results.setSamplerData(samplerData);
  +		}
  +
  +		if (resultData != null && resultData.length() > 0)
  +		{
  +			results.setResponseData(resultData.getBytes());
  +			results.setDataType(SampleResult.TEXT);
  +		}
   
  -            results.setResponseCode(responseCode);
  -            results.setResponseMessage(responseMessage);
  -            if (samplerData != null && samplerData.length() > 0)
  -            {
  -                results.setSamplerData(samplerData);
  -            }
  +		// Record sample start time.
  +		long start = System.currentTimeMillis();
   
  -            if (resultData != null && resultData.length() > 0)
  -            {
  -                results.setResponseData(resultData.getBytes());
  -                results.setDataType(SampleResult.TEXT);
  -            }
  -
  -            // Generate a random value using the current time.
  -            long ct = start % getSleepMask();
  +		// Generate a random value using the current time.
  +		long ct = start % getSleepMask();
   
  +        try
  +        {
               // Execute the sample.  In this case sleep for the
               // specified time.
               Thread.sleep(getSleepTime() + ct);
  -
  -            // Record end time and populate the results.
  -            long end = System.currentTimeMillis();
  -
  -            results.setTime(end - start);
               results.setSuccessful(success);
  -            results.setSampleLabel(label);
           }
           catch (Exception e)
           {
               getLogger().error("JavaTest: error during sample", e);
               results.setSuccessful(false);
  +        } finally{
  +			// Record end time and populate the results.
  +			long end = System.currentTimeMillis();
  +			results.setTime(end - start);
           }
   
           if (getLogger().isDebugEnabled())
  
  
  

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