svn commit: r600882 - /jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java

[sebb]

Author: sebb
Date: Tue Dec  4 03:21:40 2007
New Revision: 600882

URL: http://svn.apache.org/viewvc?rev=600882&view=rev
Log:
Make variable name optional

Modified:
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=600882&r1=600881&r2=600882&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java 
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java 
Tue Dec  4 03:21:40 2007
@@ -33,11 +33,10 @@
  * Provides a Random function which returns a random long integer between a min
  * (first argument) and a max (second argument).
  * 
- * @author <a href="mailto:[EMAIL PROTECTED]">Jonathan Kwadzo</a>
  */
 public class Random extends AbstractFunction implements Serializable {
 
-       private static final long serialVersionUID = 1L;
+       private static final long serialVersionUID = 2L;
        
        private static final List desc = new LinkedList();
 
@@ -46,7 +45,7 @@
        static {
                desc.add(JMeterUtils.getResString("minimum_param")); 
//$NON-NLS-1$
                desc.add(JMeterUtils.getResString("maximum_param")); 
//$NON-NLS-1$
-               desc.add(JMeterUtils.getResString("function_name_param")); 
//$NON-NLS-1$
+               desc.add(JMeterUtils.getResString("function_name_paropt")); 
//$NON-NLS-1$
        }
 
        private transient CompoundVariable varName, minimum, maximum;
@@ -77,7 +76,10 @@
                long rand = min + (long) (Math.random() * (max - min + 1));
 
                String randString = Long.toString(rand);
-               vars.put(varName.execute(), randString);
+
+               if (varName != null) {
+                       vars.put(varName.execute(), randString);
+               }
 
                return randString;
 
@@ -91,12 +93,17 @@
        public synchronized void setParameters(Collection parameters) throws 
InvalidVariableException {
                Object[] values = parameters.toArray();
 
-               if (values.length < 3) {
-                       throw new InvalidVariableException();
+               if (values.length < 2 || values.length > 3) {
+                       throw new InvalidVariableException("Expecting 2 or 3 
parameters, but found " + values.length);//$NON-NLS-1$
                }
-               varName = (CompoundVariable) values[2];
+
                minimum = (CompoundVariable) values[0];
                maximum = (CompoundVariable) values[1];
+               if (values.length>2){
+                       varName = (CompoundVariable) values[2];
+               } else {
+                       varName = null;
+               }
 
        }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]