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/08/10 15:13:36 UTC

svn commit: r1755766 - /jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java

Author: pmouawad
Date: Wed Aug 10 15:13:36 2016
New Revision: 1755766

URL: http://svn.apache.org/viewvc?rev=1755766&view=rev
Log:
Bug 59963 - New Function __RandomFromMultipleVars: Ability to compute a random value from values of 1 or more variables
Handle matchNr == 0 (JSON Path Extractor)
reuse value
Bugzilla Id: 59963

Modified:
    jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java?rev=1755766&r1=1755765&r2=1755766&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java Wed Aug 10 15:13:36 2016
@@ -112,15 +112,18 @@ public class RandomFromMultipleVars exte
             JMeterVariables vars, List<String> results)
             throws NumberFormatException {
         String matchNumberAsStr = vars.get(variableName+"_matchNr");
+        int matchNumber = 0;
         if(!StringUtils.isEmpty(matchNumberAsStr)) {
-            int matchNumber = Integer.parseInt(matchNumberAsStr);
+            matchNumber = Integer.parseInt(matchNumberAsStr);
+        }
+        if(matchNumber > 0) {
             for (int i = 1; i <= matchNumber; i++) {
                 results.add(vars.get(variableName+"_"+i));
             }
         } else {
             String value = vars.get(variableName);
             if(!StringUtils.isEmpty(value)) {
-                results.add(vars.get(variableName));
+                results.add(value);
             }
         }
     }