Author: sebb
Date: Tue May 15 16:19:07 2007
New Revision: 538379
URL: http://svn.apache.org/viewvc?view=rev&rev=538379
Log:
Fix clone() methods; add serialversionid
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/CSVRead.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/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/Random.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.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/StringFromFile.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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -39,13 +39,14 @@
/**
* A function which understands BeanShell
*
- * @version $Revision$ Updated on: $Date$
*/
public class BeanShell extends AbstractFunction implements Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 1L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__BeanShell"; //$NON-NLS-1$
@@ -64,8 +65,8 @@
public BeanShell() {
}
- public Object clone() {
- return new BeanShell();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/*
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/CSVRead.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/CSVRead.java?view=diff&rev=538379&r1=538378&r2=538379
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/CSVRead.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/CSVRead.java
Tue May 15 16:19:07 2007
@@ -70,9 +70,8 @@
public CSVRead() {
}
- public Object clone() {
- CSVRead newReader = new CSVRead();
- return newReader;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/**
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -58,10 +58,10 @@
* Clone this Add object.
*
* @return A new Add object.
+ * @throws CloneNotSupportedException
*/
- public Object clone() {
- IntSum newIntSum = new IntSum();
- return newIntSum;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/**
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -31,6 +31,8 @@
public class IterationCounter extends AbstractFunction implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__counter"; //$NON-NLS-1$
@@ -65,10 +67,8 @@
return this;
}
- public Object clone() {
- IterationCounter newCounter = new IterationCounter();
- newCounter.globalCounter = globalCounter;
- return newCounter;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/*
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -54,9 +54,8 @@
public JavaScript() {
}
- public Object clone() {
- JavaScript newJavaScript = new JavaScript();
- return newJavaScript;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/*
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -63,8 +63,8 @@
public LogFunction() {
}
- public Object clone() {
- return new LogFunction();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -63,8 +63,8 @@
public LogFunction2() {
}
- public Object clone() {
- return new LogFunction2();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -49,8 +49,8 @@
public MachineName() {
}
- public Object clone() {
- return new MachineName();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -63,8 +63,8 @@
public Property() {
}
- public Object clone() {
- return new Property();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -68,8 +68,8 @@
public Property2() {
}
- public Object clone() {
- return new Property2();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Random.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Random.java?view=diff&rev=538379&r1=538378&r2=538379
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Random.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Random.java
Tue May 15 16:19:07 2007
@@ -37,6 +37,8 @@
*/
public class Random extends AbstractFunction implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__Random"; //$NON-NLS-1$
@@ -55,14 +57,8 @@
public Random() {
}
- /**
- * Clone this Add object.
- *
- * @return A new Add object.
- */
- public Object clone() {
- Random newRandom = new Random();
- return newRandom;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/**
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java?view=diff&rev=538379&r1=538378&r2=538379
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
Tue May 15 16:19:07 2007
@@ -46,6 +46,8 @@
public class RegexFunction extends AbstractFunction implements Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 1L;
+
public static final String ALL = "ALL"; //$NON-NLS-1$
public static final String RAND = "RAND"; //$NON-NLS-1$
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -62,8 +62,8 @@
public SetProperty() {
}
- public Object clone() {
- return new SetProperty();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -65,8 +65,8 @@
public SplitFunction() {
}
- public Object clone() {
- return new SplitFunction();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/StringFromFile.java?view=diff&rev=538379&r1=538378&r2=538379
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/StringFromFile.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/StringFromFile.java
Tue May 15 16:19:07 2007
@@ -63,6 +63,8 @@
public class StringFromFile extends AbstractFunction implements Serializable,
TestListener {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 1L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__StringFromFile";//$NON-NLS-1$
@@ -88,9 +90,9 @@
private static final int MAX_PARAM_COUNT = 4;
- transient private String myValue = ERR_IND;
+ transient private String myValue;
- transient private String myName = "StringFromFile_";//$NON-NLS-1$ -
Name to store the value in
+ transient private String myName;
transient private Object[] values;
@@ -104,13 +106,24 @@
transient private String fileName; // needed for error messages
public StringFromFile() {
+ init();
if (log.isDebugEnabled()) {
log.debug("++++++++ Construct " + this);
}
}
- public Object clone() {
- StringFromFile newReader = new StringFromFile();
+ private void init(){
+ myValue = ERR_IND;
+ myName = "StringFromFile_";//$NON-NLS-1$
+ }
+
+ private Object readResolve(){
+ init();
+ return this;
+ }
+
+ public Object clone() throws CloneNotSupportedException {
+ StringFromFile newReader = (StringFromFile) super.clone();
if (log.isDebugEnabled()) { // Skip expensive parameter
creation ..
log.debug(this + "::StringFromFile.clone()", new
Throwable("debug"));//$NON-NLS-1$
}
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -40,6 +40,8 @@
*/
public class TimeFunction extends AbstractFunction implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private static final String KEY = "__time"; // $NON-NLS-1$
private static final List desc = new LinkedList();
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -58,8 +58,8 @@
public Variable() {
}
- public Object clone() {
- return new Variable();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
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=538379&r1=538378&r2=538379
==============================================================================
---
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
Tue May 15 16:19:07 2007
@@ -66,9 +66,8 @@
public XPath() {
}
- public Object clone() {
- XPath newReader = new XPath();
- return newReader;
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
