Author: sebb
Date: Sat May 19 10:01:40 2007
New Revision: 539775
URL: http://svn.apache.org/viewvc?view=rev&rev=539775
Log:
Functions are shared between threads, so setParameters() and execute() need to
be synchronized if there are any class fields.
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SplitFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/TimeFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPath.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java
Sat May 19 10:01:40 2007
@@ -142,7 +142,7 @@
*
* @see org.apache.jmeter.functions.Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
Sat May 19 10:01:40 2007
@@ -93,7 +93,7 @@
*
* @see Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
if (values.length < 3) {
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
Sat May 19 10:01:40 2007
@@ -112,7 +112,7 @@
*
* @see org.apache.jmeter.functions.Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
variables = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
Sat May 19 10:01:40 2007
@@ -106,7 +106,7 @@
*
* @see org.apache.jmeter.functions.Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
Sat May 19 10:01:40 2007
@@ -55,7 +55,7 @@
private Object[] values;
- public String execute(SampleResult result, Sampler sampler)
+ public synchronized String execute(SampleResult result, Sampler sampler)
throws InvalidVariableException
{
String str = ""; //$NON-NLS-1$
@@ -97,7 +97,7 @@
return KEY;
}
- public void setParameters(Collection parameters)
+ public synchronized void setParameters(Collection parameters)
throws InvalidVariableException
{
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
Sat May 19 10:01:40 2007
@@ -122,7 +122,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
Sat May 19 10:01:40 2007
@@ -91,7 +91,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
Sat May 19 10:01:40 2007
@@ -86,7 +86,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
Sat May 19 10:01:40 2007
@@ -85,7 +85,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
Sat May 19 10:01:40 2007
@@ -87,7 +87,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
Sat May 19 10:01:40 2007
@@ -85,7 +85,7 @@
}
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SplitFunction.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SplitFunction.java
Sat May 19 10:01:40 2007
@@ -98,7 +98,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/TimeFunction.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/TimeFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/TimeFunction.java
Sat May 19 10:01:40 2007
@@ -89,7 +89,7 @@
*
* @see org.apache.jmeter.functions.Function#execute(SampleResult, Sampler)
*/
- public String execute(SampleResult previousResult, Sampler currentSampler)
throws InvalidVariableException {
+ public synchronized String execute(SampleResult previousResult, Sampler
currentSampler) throws InvalidVariableException {
String datetime;
if (format.length() == 0){// Default to milliseconds
datetime = Long.toString(System.currentTimeMillis());
@@ -115,7 +115,7 @@
*
* @see org.apache.jmeter.functions.Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
checkParameterCount(parameters, 0, 2);
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
Sat May 19 10:01:40 2007
@@ -70,7 +70,7 @@
}
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
values = parameters.toArray();
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPath.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPath.java?view=diff&rev=539775&r1=539774&r2=539775
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPath.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPath.java
Sat May 19 10:01:40 2007
@@ -110,7 +110,7 @@
/**
* @see org.apache.jmeter.functions.Function#setParameters(Collection)
*/
- public void setParameters(Collection parameters) throws
InvalidVariableException {
+ public synchronized void setParameters(Collection parameters) throws
InvalidVariableException {
log.debug("setParameter - Collection.size=" +
parameters.size());
values = parameters.toArray();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
