You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by js...@apache.org on 2003/12/15 09:10:30 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/engine/util ValueReplacer.java
jsalvata 2003/12/15 00:10:30
Modified: src/core/org/apache/jmeter/engine/util ValueReplacer.java
Log:
Simplify.
Revision Changes Path
1.11 +22 -7 jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Index: ValueReplacer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ValueReplacer.java 2 Oct 2003 13:36:27 -0000 1.10
+++ ValueReplacer.java 15 Dec 2003 08:10:30 -0000 1.11
@@ -32,16 +32,13 @@
transient private static Logger log = LoggingManager.getLoggerForClass();
CompoundVariable masterFunction = new CompoundVariable();
Map variables = new HashMap();
- TestPlan tp;
public ValueReplacer()
{
- tp = new TestPlan();
}
public ValueReplacer(TestPlan tp)
{
- this.tp = tp;
setUserDefinedVariables(tp.getUserDefinedVariables());
}
@@ -90,10 +87,9 @@
public void addVariable(String name, String value)
{
- tp.addParameter(name, value);
- setUserDefinedVariables(tp.getUserDefinedVariables());
+ variables.put(name, value);
}
-
+
private Collection replaceValues(
PropertyIterator iter,
ValueTransformer transform)
@@ -103,9 +99,18 @@
while(iter.hasNext())
{
JMeterProperty val = iter.next();
+ if (log.isDebugEnabled())
+ {
+ log.debug("About to replace in property of tipe: "
+ +val.getClass()+": "+val);
+ }
if (val instanceof StringProperty)
{
val = transform.transformValue((StringProperty) val);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Replacement result: " +val);
+ }
}
else if (val instanceof MultiProperty)
{
@@ -117,6 +122,16 @@
while(propIter.hasNext())
{
multiVal.addProperty((JMeterProperty) propIter.next());
+ }
+ if (log.isDebugEnabled())
+ {
+ log.debug("Replacement result: " +multiVal);
+ }
+ }
+ else {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Won't replace.");
}
}
props.add(val);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org