You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/21 16:14:06 UTC
svn commit: r1775484 -
/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
Author: pmouawad
Date: Wed Dec 21 16:14:06 2016
New Revision: 1775484
URL: http://svn.apache.org/viewvc?rev=1775484&view=rev
Log:
Sonar : Fix code smells
Modified:
jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=1775484&r1=1775483&r2=1775484&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java Wed Dec 21 16:14:06 2016
@@ -56,6 +56,10 @@ public class RandomVariableConfig extend
private boolean perThread;
+ private int range;
+
+ private long minimum;
+
// This class is not cloned per thread, so this is shared
private Random globalRandom = null;
@@ -72,9 +76,6 @@ public class RandomVariableConfig extend
}};
}
- private int n;
- private long minimum;
-
private Object readResolve(){
perThreadRandom = initThreadLocal();
return this;
@@ -92,14 +93,14 @@ public class RandomVariableConfig extend
long rangeL=maximum-minimum+1; // This can overflow
if (minimum >= maximum){
log.error("maximum("+maxAsString+") must be > minimum"+minAsString+")");
- n=0;// This is used as an error indicator
+ range=0;// This is used as an error indicator
return;
}
if (rangeL > Integer.MAX_VALUE || rangeL <= 0){// check for overflow too
log.warn("maximum("+maxAsString+") - minimum"+minAsString+") must be <="+Integer.MAX_VALUE);
rangeL=Integer.MAX_VALUE;
}
- n = (int)rangeL;
+ range = (int)rangeL;
}
/** {@inheritDoc} */
@@ -117,10 +118,10 @@ public class RandomVariableConfig extend
randGen=globalRandom;
}
}
- if (n <=0){
+ if (range <=0){
return;
}
- long nextRand = minimum + randGen.nextInt(n);
+ long nextRand = minimum + randGen.nextInt(range);
// Cannot use getThreadContext() as we are not cloned per thread
JMeterVariables variables = JMeterContextService.getContext().getVariables();
variables.put(getVariableName(), formatNumber(nextRand));
@@ -193,7 +194,7 @@ public class RandomVariableConfig extend
* @return the randomSeed as a long
*/
private synchronized long getRandomSeedAsLong() {
- long seed = 0;
+ long seed;
if (randomSeed.length()==0){
seed = System.currentTimeMillis();
} else {