You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2015/06/01 20:14:37 UTC

svn commit: r1682966 - in /jmeter/trunk/src: components/org/apache/jmeter/control/RandomController.java core/org/apache/jmeter/util/ThreadLocalRandom.java functions/org/apache/jmeter/functions/Random.java

Author: sebb
Date: Mon Jun  1 18:14:37 2015
New Revision: 1682966

URL: http://svn.apache.org/r1682966
Log:
Update to Java 7
ThreadLocalRandom now part of JVM
Bugzilla Id: 57981

Removed:
    jmeter/trunk/src/core/org/apache/jmeter/util/ThreadLocalRandom.java
Modified:
    jmeter/trunk/src/components/org/apache/jmeter/control/RandomController.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/RandomController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/RandomController.java?rev=1682966&r1=1682965&r2=1682966&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/RandomController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/RandomController.java Mon Jun  1 18:14:37 2015
@@ -19,8 +19,7 @@
 package org.apache.jmeter.control;
 
 import java.io.Serializable;
-
-import org.apache.jmeter.util.ThreadLocalRandom;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Controller that rans randomly one of it's children on each iteration

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=1682966&r1=1682965&r2=1682966&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java Mon Jun  1 18:14:37 2015
@@ -21,13 +21,13 @@ package org.apache.jmeter.functions;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.util.ThreadLocalRandom;
 
 /**
  * Provides a Random function which returns a random long integer between a min