svn commit: r921767 - /jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java

[se...@apache.org]

Author: sebb
Date: Thu Mar 11 10:07:48 2010
New Revision: 921767

URL: http://svn.apache.org/viewvc?rev=921767&view=rev
Log:
Avoid NPE when mask == 0

Modified:
    jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java

Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java?rev=921767&r1=921766&r2=921767&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java Thu Mar 11 10:07:48 2010
@@ -126,9 +126,13 @@ public class SleepTest extends AbstractJ
             // Record sample start time.
             results.sampleStart();
 
-            // Generate a random value using the current time.
-            long start = System.currentTimeMillis();
-            long sleep = getSleepTime() + (start % getSleepMask());
+            long sleep = sleepTime;
+            // Only do the calculation if it is needed
+            if (sleepTime > 0 && sleepMask > 0) {
+                long start = System.currentTimeMillis();
+                // Generate a random-ish offset value using the current time.
+                sleep = sleepTime + (start % sleepMask);
+            }
 
             results.setSampleLabel("Sleep Test: time = " + sleep);
 
@@ -217,23 +221,4 @@ public class SleepTest extends AbstractJ
         sb.append(Integer.toHexString(hashCode()));
         return sb.toString();
     }
-
-    /**
-     * Get the value of the sleepTime field.
-     *
-     * @return the base number of milliseconds to sleep during each sample.
-     */
-    private long getSleepTime() {
-        return sleepTime;
-    }
-
-    /**
-     * Get the value of the sleepMask field.
-     *
-     * @return a mask to be applied to the current time in order to add a random
-     *         component to the sleep time.
-     */
-    private long getSleepMask() {
-        return sleepMask;
-    }
 }



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