sebb 2005/05/19 16:15:07
Modified: src/functions/org/apache/jmeter/functions JavaScript.java
Log:
Allow variable name to be omitted
Revision Changes Path
1.9 +6 -5
jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java
Index: JavaScript.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaScript.java 18 Mar 2005 15:26:53 -0000 1.8
+++ JavaScript.java 19 May 2005 23:15:06 -0000 1.9
@@ -72,7 +72,8 @@
JMeterVariables vars = getVariables();
String script = ((CompoundVariable) values[0]).execute();
- String varName =
+ // Allow variable to be omitted
+ String varName = values.length < 2 ? null :
((CompoundVariable) values[1]).execute();
String resultStr = "";
@@ -84,7 +85,7 @@
Object result = cx.evaluateString(scope, script, "<cmd>", 1,
null);
resultStr = Context.toString(result);
- vars.put(varName, resultStr);
+ if (varName != null) vars.put(varName, resultStr);
}
catch (WrappedException e)
@@ -120,10 +121,10 @@
values = parameters.toArray();
- if (values.length != 2)
+ if (values.length < 1 || values.length > 2)
{
throw new InvalidVariableException(
- "Expecting 2 parameters, but found " +
values.length);//$NON-NLS-1$
+ "Expecting 1 or 2 parameters, but found " +
values.length);//$NON-NLS-1$
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
