sebb 2003/10/19 15:22:22
Modified: src/core/org/apache/jmeter/engine/util CompoundVariable.java
src/core/org/apache/jmeter/engine ClientJMeterEngine.java
PreCompiler.java
src/core/org/apache/jmeter/control GenericController.java
Log:
Fix @created; remove unused fields; make log final
Revision Changes Path
1.22 +2 -8
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Index: CompoundVariable.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CompoundVariable.java 5 Oct 2003 01:05:31 -0000 1.21
+++ CompoundVariable.java 19 Oct 2003 22:22:22 -0000 1.22
@@ -87,15 +87,11 @@
private String rawParameters;
- //private JMeterVariables threadVars;
- //private Map varMap = new HashMap();
-
static FunctionParser functionParser = new FunctionParser();
static Map functions = new HashMap();
private boolean hasFunction, isDynamic;
- private String staticSubstitution;
- //private Perl5Util util = new Perl5Util();
+
private String permanentResults = "";
LinkedList compiledComponents = new LinkedList();
@@ -130,7 +126,6 @@
super();
isDynamic = true;
hasFunction = false;
- staticSubstitution = "";
}
public CompoundVariable(String parameters)
@@ -233,7 +228,6 @@
{
hasFunction = false;
compiledComponents.clear();
- staticSubstitution = "";
}
public void setParameters(String parameters)
1.11 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Index: ClientJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClientJMeterEngine.java 9 Oct 2003 01:02:53 -0000 1.10
+++ ClientJMeterEngine.java 19 Oct 2003 22:22:22 -0000 1.11
@@ -66,7 +66,7 @@
/**
- * @author $Author$
+ * @author
* @version $Revision$ Updated on: $Date$
*/
public class ClientJMeterEngine implements JMeterEngine,Runnable
1.17 +1 -3
jakarta-jmeter/src/core/org/apache/jmeter/engine/PreCompiler.java
Index: PreCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/PreCompiler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PreCompiler.java 5 Oct 2003 01:15:52 -0000 1.16
+++ PreCompiler.java 19 Oct 2003 22:22:22 -0000 1.17
@@ -18,7 +18,6 @@
public class PreCompiler implements HashTreeTraverser
{
transient private static Logger log = LoggingManager.getLoggerForClass();
- private boolean testValid = true;
private ValueReplacer replacer;
public PreCompiler()
@@ -49,7 +48,6 @@
catch (InvalidVariableException e)
{
log.error("invalid variables", e);
- testValid = false;
}
}
}
1.20 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java
Index: GenericController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GenericController.java 15 Sep 2003 23:13:16 -0000 1.19
+++ GenericController.java 19 Oct 2003 22:22:22 -0000 1.20
@@ -82,7 +82,7 @@
extends AbstractTestElement
implements Controller, Serializable
{
- protected static Logger log = LoggingManager.getLoggerForClass();
+ protected static final Logger log = LoggingManager.getLoggerForClass();
protected LinkedList iterationListeners = new LinkedList();
protected List subControllersAndSamplers = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
