Author: sebb
Date: Wed Jan 16 07:04:40 2008
New Revision: 612476
URL: http://svn.apache.org/viewvc?rev=612476&view=rev
Log:
Allow most functions to be used on TestPlan.
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=612476&r1=612475&r2=612476&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
Wed Jan 16 07:04:40 2008
@@ -113,7 +113,7 @@
if (bshOut != null) {
resultStr = bshOut.toString();
}
- if (varName.length() > 0) {
+ if (vars != null && varName.length() > 0) {// vars will
be null on TestPlan
vars.put(varName, resultStr);
}
} catch (Exception ex) // Mainly for bsh.EvalError
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java?rev=612476&r1=612475&r2=612476&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
Wed Jan 16 07:04:40 2008
@@ -84,7 +84,9 @@
}
String totalString = Integer.toString(sum);
- vars.put(varName, totalString);
+ if (vars != null){// vars will be null on TestPlan
+ vars.put(varName, totalString);
+ }
return totalString;
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java?rev=612476&r1=612475&r2=612476&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
Wed Jan 16 07:04:40 2008
@@ -83,7 +83,9 @@
}
String totalString = Long.toString(sum);
- vars.put(varName, totalString);
+ if (vars != null){// vars will be null on TestPlan
+ vars.put(varName, totalString);
+ }
return totalString;
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java?rev=612476&r1=612475&r2=612476&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
Wed Jan 16 07:04:40 2008
@@ -54,8 +54,6 @@
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
throws InvalidVariableException {
- JMeterVariables vars = getVariables();
-
/*
* boolean fullHostName = false; if (((CompoundFunction)
values[0])
* .execute() .toLowerCase() .equals("true")) { fullHostName =
true; }
@@ -79,9 +77,12 @@
}
if (values.length >= 1){// we have a variable name
- String varName = ((CompoundVariable)
values[0]).execute();
- if (varName.length() > 0) {
- vars.put(varName, machineName);
+ JMeterVariables vars = getVariables();
+ if (vars != null) {// May be null if function is used
on TestPlan
+ String varName = ((CompoundVariable)
values[0]).execute();
+ if (varName.length() > 0) {
+ vars.put(varName, machineName);
+ }
}
}
return machineName;
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=612476&r1=612475&r2=612476&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
Wed Jan 16 07:04:40 2008
@@ -68,7 +68,6 @@
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
throws InvalidVariableException {
- JMeterVariables vars = getVariables();
long min = Long.parseLong(minimum.execute().trim());
long max = Long.parseLong(maximum.execute().trim());
@@ -78,7 +77,10 @@
String randString = Long.toString(rand);
if (varName != null) {
- vars.put(varName.execute(), randString);
+ JMeterVariables vars = getVariables();
+ if (vars != null){// vars will be null on TestPlan
+ vars.put(varName.execute(), randString);
+ }
}
return randString;
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=612476&r1=612475&r2=612476&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
Wed Jan 16 07:04:40 2008
@@ -103,7 +103,9 @@
if (variable.length() > 0) {
JMeterVariables vars = getVariables();
- vars.put(variable, datetime);
+ if (vars != null){// vars will be null on TestPlan
+ vars.put(variable, datetime);
+ }
}
return datetime;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
