Author: sebb
Date: Wed Oct 8 06:11:08 2008
New Revision: 702860
URL: http://svn.apache.org/viewvc?rev=702860&view=rev
Log:
Functions don't need to be serializable
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.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/Property.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -38,12 +37,10 @@
* A function which understands BeanShell
*
*/
-public class BeanShell extends AbstractFunction implements Serializable {
+public class BeanShell extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final List desc = new LinkedList();
private static final String KEY = "__BeanShell"; //$NON-NLS-1$
@@ -55,9 +52,9 @@
desc.add(JMeterUtils.getResString("function_name_paropt"));//
$NON-NLS1$
}
- private transient Object[] values;
+ private Object[] values;
- private transient BeanShellInterpreter bshInterpreter = null;
+ private BeanShellInterpreter bshInterpreter = null;
public BeanShell() {
}
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -51,11 +50,9 @@
* __CSVRead(*ONE,1); etc
*
*/
-public class CSVRead extends AbstractFunction implements Serializable {
+public class CSVRead extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final String KEY = "__CSVRead"; // Function name
//$NON-NLS-1$
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -34,7 +33,7 @@
/**
* Function to generate chars from a list of decimal or hex values
*/
-public class CharFunction extends AbstractFunction implements Serializable {
+public class CharFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -47,7 +46,7 @@
*
* @see StringEscapeUtils#escapeHtml(String) (Commons Lang)
*/
-public class EscapeHtml extends AbstractFunction implements Serializable {
+public class EscapeHtml extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
Wed Oct 8 06:11:08 2008
@@ -20,7 +20,6 @@
// @see PackageTest for unit tests
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -38,9 +37,7 @@
* Returns: the evaluated value
*
*/
-public class EvalFunction extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class EvalFunction extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
Wed Oct 8 06:11:08 2008
@@ -20,7 +20,6 @@
// @see PackageTest for unit tests
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -41,9 +40,7 @@
* Returns: the evaluated value
*
*/
-public class EvalVarFunction extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class EvalVarFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -34,9 +33,7 @@
*
* @see LongSum
*/
-public class IntSum extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class IntSum extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -29,19 +28,17 @@
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-public class IterationCounter extends AbstractFunction implements Serializable
{
-
- private static final long serialVersionUID = 233L;
+public class IterationCounter extends AbstractFunction {
private static final List desc = new LinkedList();
private static final String KEY = "__counter"; //$NON-NLS-1$
- private transient ThreadLocal perThreadInt;
+ private ThreadLocal perThreadInt;
- private transient Object[] variables;
+ private Object[] variables;
- private transient int globalCounter;//MAXINT = 2,147,483,647
+ private int globalCounter;//MAXINT = 2,147,483,647
private void init(){
synchronized(this){
@@ -63,11 +60,6 @@
init();
}
- private Object readResolve(){
- init();
- return this;
- }
-
/*
* (non-Javadoc)
*
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -38,9 +37,7 @@
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.WrappedException;
-public class JavaScript extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class JavaScript extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
Wed Oct 8 06:11:08 2008
@@ -16,7 +16,6 @@
*/
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -40,9 +39,7 @@
* A function which understands Commons JEXL
*/
// For unit tests, see TestJexlFunction
-public class JexlFunction extends AbstractFunction implements Serializable
-{
- private static final long serialVersionUID = 232L;
+public class JexlFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -48,11 +47,9 @@
* Returns: - the input string
*
*/
-public class LogFunction extends AbstractFunction implements Serializable {
+public class LogFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final List desc = new LinkedList();
private static final String KEY = "__log"; //$NON-NLS-1$
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -46,11 +45,9 @@
* Returns: - Empty String (so can be used where return value would be a
nuisance)
*
*/
-public class LogFunction2 extends AbstractFunction implements Serializable {
+public class LogFunction2 extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final List desc = new LinkedList();
private static final String KEY = "__logn"; //$NON-NLS-1$
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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -33,9 +32,7 @@
* Provides a longSum function that adds two or more long values.
* @see IntSum
*/
-public class LongSum extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class LongSum extends AbstractFunction {
private static final List desc = new LinkedList();
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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -29,7 +28,7 @@
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-public class MachineName extends AbstractFunction implements Serializable {
+public class MachineName extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -43,9 +42,7 @@
* - the property name itself
*
*/
-public class Property extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class Property extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -48,9 +47,7 @@
* not present - "1" (suitable for use in ThreadGroup GUI)
*
*/
-public class Property2 extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class Property2 extends AbstractFunction {
private static final List desc = new LinkedList();
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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -34,9 +33,7 @@
* (first argument) and a max (second argument).
*
*/
-public class Random extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class Random extends AbstractFunction {
private static final List desc = new LinkedList();
@@ -48,7 +45,7 @@
desc.add(JMeterUtils.getResString("function_name_paropt"));
//$NON-NLS-1$
}
- private transient CompoundVariable varName, minimum, maximum;
+ private CompoundVariable varName, minimum, maximum;
/**
* No-arg constructor.
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
Wed Oct 8 06:11:08 2008
@@ -18,8 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -47,11 +45,9 @@
// @see TestRegexFunction for unit tests
-public class RegexFunction extends AbstractFunction implements Serializable {
+public class RegexFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
public static final String ALL = "ALL"; //$NON-NLS-1$
public static final String RAND = "RAND"; //$NON-NLS-1$
@@ -64,7 +60,7 @@
private static final List desc = new LinkedList();
- private transient Pattern templatePattern;// initialised to the regex
\$(\d+)\$
+ private Pattern templatePattern;// initialised to the regex \$(\d+)\$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 2;
@@ -89,13 +85,6 @@
Perl5Compiler.READ_ONLY_MASK);
}
- // For serialised objects, do the same work as the constructor:
- private Object readResolve() throws ObjectStreamException {
- initPattern();
- return this;
- }
-
-
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
throws InvalidVariableException {
String valueIndex = "", defaultValue = "", between = ""; //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -41,9 +41,7 @@
* Returns: nothing or original value if the 3rd parameter is true
*
*/
-public class SetProperty extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class SetProperty extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -55,11 +55,9 @@
* </ul>
*
*/
-public class SplitFunction extends AbstractFunction implements Serializable {
+public class SplitFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final List desc = new LinkedList();
private static final String KEY = "__split";// $NON-NLS-1$
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
Wed Oct 8 06:11:08 2008
@@ -21,7 +21,7 @@
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
-import java.io.Serializable;
+
import java.text.DecimalFormat;
import java.util.Collection;
import java.util.LinkedList;
@@ -60,11 +60,9 @@
* - the output variable name is resolved every time the function is invoked
*
*/
-public class StringFromFile extends AbstractFunction implements Serializable,
TestListener {
+public class StringFromFile extends AbstractFunction implements TestListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
private static final List desc = new LinkedList();
private static final String KEY = "__StringFromFile";//$NON-NLS-1$
@@ -90,20 +88,20 @@
private static final int MAX_PARAM_COUNT = 4;
- private transient String myValue;
+ private String myValue;
- private transient String myName;
+ private String myName;
- private transient Object[] values;
+ private Object[] values;
- private transient BufferedReader myBread = null; // Buffered reader
+ private BufferedReader myBread = null; // Buffered reader
- private transient FileReader fis; // keep this round to close it
+ private FileReader fis; // keep this round to close it
- private transient boolean firstTime = false; // should we try to open the
+ private boolean firstTime = false; // should we try to open the
// file?
- private transient String fileName; // needed for error messages
+ private String fileName; // needed for error messages
public StringFromFile() {
init();
@@ -117,11 +115,6 @@
myName = "StringFromFile_";//$NON-NLS-1$
}
- private Object readResolve(){
- init();
- return this;
- }
-
/*
* Warning: the file will generally be left open at the end of a test run.
* This is because functions don't (yet) have any way to find out when a
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=702860&r1=702859&r2=702860&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 Oct 8 06:11:08 2008
@@ -18,7 +18,6 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
@@ -38,9 +37,7 @@
/**
* __time() function - returns the current time in milliseconds
*/
-public class TimeFunction extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 1L;
+public class TimeFunction extends AbstractFunction {
private static final String KEY = "__time"; // $NON-NLS-1$
@@ -67,14 +64,8 @@
}
// Ensure that these are set, even if no paramters are provided
- private transient String format = ""; //$NON-NLS-1$
- private transient String variable = ""; //$NON-NLS-1$
-
- private Object readResolve(){
- format="";
- variable="";
- return this;
- }
+ private String format = ""; //$NON-NLS-1$
+ private String variable = ""; //$NON-NLS-1$
public TimeFunction(){
super();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -36,7 +36,7 @@
*
* @see StringEscapeUtils#unescapeJava(String)
*/
-public class UnEscape extends AbstractFunction implements Serializable {
+public class UnEscape extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -38,7 +38,7 @@
* e.g. ">&zzzz;x" will become ">&zzzz;x".
* @see StringEscapeUtils#unescapeHtml(String) (Commons Lang)
*/
-public class UnEscapeHtml extends AbstractFunction implements Serializable {
+public class UnEscapeHtml extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -39,9 +39,7 @@
* - the variable name itself
*
*/
-public class Variable extends AbstractFunction implements Serializable {
-
- private static final long serialVersionUID = 232L;
+public class Variable extends AbstractFunction {
private static final List desc = new LinkedList();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java?rev=702860&r1=702859&r2=702860&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
Wed Oct 8 06:11:08 2008
@@ -18,7 +18,7 @@
package org.apache.jmeter.functions;
-import java.io.Serializable;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -45,11 +45,9 @@
* is opened and used for all threads.
*
*/
-public class XPath extends AbstractFunction implements Serializable {
+public class XPath extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 232L;
-
// static {
// LoggingManager.setPriority("DEBUG","jmeter");
// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
