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 ms...@apache.org on 2003/09/29 16:56:01 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler HTTPSampler.java
mstover1 2003/09/29 07:56:01
Modified: bin jmeter.bat jmeter.properties
src/core/org/apache/jmeter/config Arguments.java
src/core/org/apache/jmeter/testelement
AbstractTestElement.java TestElement.java
src/core/org/apache/jmeter/testelement/property
AbstractProperty.java BooleanProperty.java
CollectionProperty.java DoubleProperty.java
FloatProperty.java FunctionProperty.java
IntegerProperty.java JMeterProperty.java
LongProperty.java MapProperty.java
MultiProperty.java NullProperty.java
PropertyIteratorImpl.java StringProperty.java
TestElementProperty.java
src/core/org/apache/jmeter/util JMeterUtils.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
Improving memory profile
Revision Changes Path
1.24 +1 -1 jakarta-jmeter/bin/jmeter.bat
Index: jmeter.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.bat,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jmeter.bat 11 Mar 2003 19:04:18 -0000 1.23
+++ jmeter.bat 29 Sep 2003 14:56:00 -0000 1.24
@@ -30,4 +30,4 @@
rem This label provides a place for the argument list loop to break out
rem and for NT handling to skip to.
-java -Xincgc -Xmx256m -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
\ No newline at end of file
+java -server -Xmx512m -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
\ No newline at end of file
1.87 +2 -2 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- jmeter.properties 28 Jul 2003 00:54:30 -0000 1.86
+++ jmeter.properties 29 Sep 2003 14:56:00 -0000 1.87
@@ -65,7 +65,7 @@
#config.tree.icon=leafnode.gif
# Remote Hosts - comma delimited
-#remote_hosts=127.0.0.1
+remote_hosts=10.60.55.67
#Components to not display in JMeter GUI
not_in_menu=Remote Method Configuration,JNDI Configuration,JNDI Lookup Configuration,JNDI Request,Default Controller,org.apache.jmeter.control.DynamicController, org.apache.jmeter.protocol.http.control.Cookie,org.apache.jmeter.protocol.http.control.Authorization,org.apache.jmeter.config.LoginConfig,Header,org.apache.jmeter.protocol.http.config.MultipartUrlConfig
@@ -106,7 +106,7 @@
# The commented out values are the defaults.
# legitimate values: xml, csv, db. Only xml and csv are currently supported.
-jmeter.save.saveservice.output_format=xml
+jmeter.save.saveservice.output_format=csv
# true when field should be saved; false otherwise
1.7 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/config/Arguments.java
Index: Arguments.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/Arguments.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Arguments.java 15 Jun 2003 18:35:28 -0000 1.6
+++ Arguments.java 29 Sep 2003 14:56:01 -0000 1.7
@@ -158,7 +158,7 @@
new TestElementProperty(arg.getName(), arg);
if (isRunningVersion())
{
- newArg.setTemporary(true, this);
+ this.setTemporary(newArg);
}
getArguments().addItem(newArg);
}
1.25 +66 -8 jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractTestElement.java 16 Jul 2003 17:23:02 -0000 1.24
+++ AbstractTestElement.java 29 Sep 2003 14:56:01 -0000 1.25
@@ -57,13 +57,17 @@
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import org.apache.jmeter.control.NextIsNullException;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.MapProperty;
+import org.apache.jmeter.testelement.property.MultiProperty;
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.PropertyIteratorImpl;
@@ -81,6 +85,7 @@
protected static Logger log = LoggingManager.getLoggerForClass();
private Map propMap = Collections.synchronizedMap(new HashMap());
+ private Set temporaryProperties;
private boolean runningVersion = false;
@@ -239,11 +244,11 @@
{
if (isRunningVersion())
{
- property.setTemporary(true, this);
+ setTemporary(property);
}
else
{
- property.clearTemporary(this);
+ clearTemporary(property);
}
JMeterProperty prop = getProperty(property.getName());
@@ -258,6 +263,14 @@
prop.mergeIn(property);
}
}
+
+ protected void clearTemporary(JMeterProperty property)
+ {
+ if(temporaryProperties != null)
+ {
+ temporaryProperties.remove(property);
+ }
+ }
/**
* Log the properties of the test element
@@ -275,7 +288,7 @@
"Property "
+ prop.getName()
+ " is temp? "
- + prop.isTemporary(this)
+ + isTemporary(prop)
+ " and is a "
+ prop.getObjectValue());
}
@@ -346,24 +359,69 @@
public void recoverRunningVersion()
{
- PropertyIterator iter = propertyIterator();
+ Iterator iter = propMap.entrySet().iterator();
while (iter.hasNext())
{
- JMeterProperty prop = iter.next();
- if (prop.isTemporary(this))
+ Map.Entry entry = (Map.Entry)iter.next();
+ JMeterProperty prop = (JMeterProperty)entry.getValue();
+ if (isTemporary(prop))
{
iter.remove();
- prop.clearTemporary(this);
+ clearTemporary(prop);
}
else
{
prop.recoverRunningVersion(this);
}
}
+ emptyTemporary();
+ }
+
+ protected void emptyTemporary()
+ {
+ if(temporaryProperties != null)
+ {
+ temporaryProperties.clear();
+ }
}
protected Sampler nextIsNull() throws NextIsNullException
{
return null;
}
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.TestElement#isTemporary(org.apache.jmeter.testelement.property.JMeterProperty)
+ */
+ public boolean isTemporary(JMeterProperty property)
+ {
+ if(temporaryProperties == null)
+ {
+ return false;
+ }
+ else
+ {
+ return temporaryProperties.contains(property);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.TestElement#setTemporary(org.apache.jmeter.testelement.property.JMeterProperty)
+ */
+ public void setTemporary(JMeterProperty property)
+ {
+ if(temporaryProperties == null)
+ {
+ temporaryProperties = new HashSet();
+ }
+ temporaryProperties.add(property);
+ if(property instanceof MultiProperty)
+ {
+ PropertyIterator iter = ((MultiProperty)property).iterator();
+ while(iter.hasNext())
+ {
+ setTemporary(iter.next());
+ }
+ }
+ }
+
}
1.9 +16 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestElement.java
Index: TestElement.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestElement.java 28 Jun 2003 19:13:58 -0000 1.8
+++ TestElement.java 29 Sep 2003 14:56:01 -0000 1.9
@@ -25,6 +25,21 @@
public boolean isRunningVersion();
/**
+ * Test whether a given property is only a temporary resident of the TestElement
+ * @param property
+ * @return
+ * boolean
+ */
+ public boolean isTemporary(JMeterProperty property);
+
+ /**
+ * Indicate that the given property should be only a temporary property in the TestElement
+ * @param property
+ * void
+ */
+ public void setTemporary(JMeterProperty property);
+
+ /**
* Return a property as a boolean value.
*/
public boolean getPropertyAsBoolean(String key);
1.12 +12 -65 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Index: AbstractProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractProperty.java 6 Aug 2003 19:35:37 -0000 1.11
+++ AbstractProperty.java 29 Sep 2003 14:56:01 -0000 1.12
@@ -55,11 +55,11 @@
package org.apache.jmeter.testelement.property;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -71,7 +71,6 @@
protected static Logger log = LoggingManager.getLoggerForClass();
private String name;
private boolean runningVersion = false;
- private Map ownerMap;
public AbstractProperty(String name)
{
@@ -123,61 +122,10 @@
{
this.runningVersion = runningVersion;
}
-
- /* (non-Javadoc)
- * @see JMeterProperty#isTemporary(TestElement)
- */
- public boolean isTemporary(TestElement owner)
+
+ protected PropertyIterator getIterator(Collection values)
{
- if (ownerMap == null)
- {
- return false;
- }
- else
- {
- boolean[] temp = (boolean[]) ownerMap.get(owner);
- if (temp == null)
- {
- return false;
- }
- return temp[0];
- }
- }
-
- /* (non-Javadoc)
- * @see JMeterProperty#mergeIn(JMeterProperty)
- */
- public void mergeIn(JMeterProperty prop)
- {}
-
- /* (non-Javadoc)
- * @see JMeterProperty#setTemporary(boolean, TestElement)
- */
- public void setTemporary(boolean temporary, TestElement owner)
- {
- if (ownerMap == null)
- {
- ownerMap = new HashMap();
- }
- boolean[] temp = (boolean[]) ownerMap.get(owner);
- if (temp != null)
- {
- temp[0] = temporary;
- }
- else
- {
- temp = new boolean[] { temporary };
- ownerMap.put(owner, temp);
- }
- }
-
- public void clearTemporary(TestElement owner)
- {
- if (ownerMap == null)
- {
- return;
- }
- ownerMap.remove(owner);
+ return new PropertyIteratorImpl(values);
}
/* (non-Javadoc)
@@ -191,7 +139,6 @@
(AbstractProperty) this.getClass().newInstance();
prop.name = name;
prop.runningVersion = runningVersion;
- prop.ownerMap = ownerMap;
return prop;
}
catch (InstantiationException e)
@@ -269,13 +216,6 @@
}
/**
- * @see JMeterProperty#recoverRunningVersion(TestElement)
- */
- public void recoverRunningVersion(TestElement owner)
- {
- }
-
- /**
* Returns 0 if string is invalid or null.
* @see JMeterProperty#getFloatValue()
*/
@@ -479,6 +419,13 @@
public String toString()
{
return getStringValue();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#mergeIn(org.apache.jmeter.testelement.property.JMeterProperty)
+ */
+ public void mergeIn(JMeterProperty prop)
+ {
}
}
1.6 +21 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
Index: BooleanProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BooleanProperty.java 28 Jun 2003 19:13:58 -0000 1.5
+++ BooleanProperty.java 29 Sep 2003 14:56:01 -0000 1.6
@@ -1,11 +1,14 @@
package org.apache.jmeter.testelement.property;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* @version $Revision$
*/
public class BooleanProperty extends AbstractProperty
{
boolean value;
+ boolean savedValue;
public BooleanProperty(String name,boolean v)
{
@@ -63,4 +66,21 @@
{
return value;
}
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ */
+ public void setRunningVersion(boolean runningVersion)
+ {
+ savedValue = value;
+ super.setRunningVersion(runningVersion);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ */
+ public void recoverRunningVersion(TestElement owner)
+ {
+ value = savedValue;
+ }
+
}
1.12 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
Index: CollectionProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CollectionProperty.java 16 Aug 2003 10:06:56 -0000 1.11
+++ CollectionProperty.java 29 Sep 2003 14:56:01 -0000 1.12
@@ -152,7 +152,7 @@
public PropertyIterator iterator()
{
- return new PropertyIteratorImpl(value);
+ return getIterator(value);
}
/* (non-Javadoc)
1.4 +21 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
Index: DoubleProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DoubleProperty.java 28 Jun 2003 19:13:58 -0000 1.3
+++ DoubleProperty.java 29 Sep 2003 14:56:01 -0000 1.4
@@ -1,11 +1,14 @@
package org.apache.jmeter.testelement.property;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* @version $Revision$
*/
public class DoubleProperty extends NumberProperty
{
double value;
+ double savedValue;
public DoubleProperty(String name,double value)
{
@@ -97,4 +100,21 @@
{
return (long)value;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ */
+ public void setRunningVersion(boolean runningVersion)
+ {
+ savedValue = value;
+ super.setRunningVersion(runningVersion);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ */
+ public void recoverRunningVersion(TestElement owner)
+ {
+ value = savedValue;
+ }
}
1.5 +21 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
Index: FloatProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FloatProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FloatProperty.java 28 Jun 2003 19:13:58 -0000 1.4
+++ FloatProperty.java 29 Sep 2003 14:56:01 -0000 1.5
@@ -1,11 +1,14 @@
package org.apache.jmeter.testelement.property;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* @version $Revision$
*/
public class FloatProperty extends NumberProperty
{
float value;
+ float savedValue;
public FloatProperty(String name,float value)
{
@@ -16,6 +19,23 @@
public FloatProperty()
{
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ */
+ public void setRunningVersion(boolean runningVersion)
+ {
+ savedValue = value;
+ super.setRunningVersion(runningVersion);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ */
+ public void recoverRunningVersion(TestElement owner)
+ {
+ value = savedValue;
+ }
public void setValue(float value)
{
1.12 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
Index: FunctionProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionProperty.java 27 Jul 2003 20:59:57 -0000 1.11
+++ FunctionProperty.java 29 Sep 2003 14:56:01 -0000 1.12
@@ -158,7 +158,6 @@
*/
public void recoverRunningVersion(TestElement owner)
{
- super.recoverRunningVersion(owner);
cacheValue = null;
}
}
1.6 +21 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
Index: IntegerProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IntegerProperty.java 16 Jul 2003 13:12:11 -0000 1.5
+++ IntegerProperty.java 29 Sep 2003 14:56:01 -0000 1.6
@@ -54,18 +54,38 @@
*/
package org.apache.jmeter.testelement.property;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* @version $Revision$
*/
public class IntegerProperty extends NumberProperty
{
int value;
+ int savedValue;
public IntegerProperty(String name, int value)
{
super(name);
this.value = value;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ */
+ public void setRunningVersion(boolean runningVersion)
+ {
+ savedValue = value;
+ super.setRunningVersion(runningVersion);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ */
+ public void recoverRunningVersion(TestElement owner)
+ {
+ value = savedValue;
+ }
public IntegerProperty(String name)
{
1.4 +0 -24 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
Index: JMeterProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeterProperty.java 2 May 2003 21:38:09 -0000 1.3
+++ JMeterProperty.java 29 Sep 2003 14:56:01 -0000 1.4
@@ -46,14 +46,6 @@
public void recoverRunningVersion(TestElement owner);
/**
- * Indicates whether the property is a temporary property. A property newly
- * created and added to a test element that is currently a running version
- * should be made temporary.
- * @return boolean
- */
- public boolean isTemporary(TestElement owner);
-
- /**
* Take the given property object and merge it's value with the current
* property object. For most property types, this will simply be ignored.
* But for collection properties and test element properties, more complex
@@ -61,22 +53,6 @@
* @param prop
*/
public void mergeIn(JMeterProperty prop);
-
- /**
- * A property newly created and added to a test element that is currently a
- * running version should be made temporary. This indicates it is not part
- * of the running version of the test element and will be deleted when the
- * test element recovers state.
- * @param temporary
- */
- public void setTemporary(boolean temporary, TestElement owner);
-
- /**
- * Tells the property that it should clear information regarding the
- * temporary attribute for the given owner.
- * @param owner
- */
- public void clearTemporary(TestElement owner);
public int getIntValue();
1.5 +21 -1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/LongProperty.java
Index: LongProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/LongProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LongProperty.java 28 Jun 2003 19:13:57 -0000 1.4
+++ LongProperty.java 29 Sep 2003 14:56:01 -0000 1.5
@@ -1,5 +1,7 @@
package org.apache.jmeter.testelement.property;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* @version $Revision$
@@ -7,6 +9,7 @@
public class LongProperty extends NumberProperty
{
long value;
+ long savedValue;
public LongProperty(String name, long value)
{
@@ -18,6 +21,23 @@
{
super();
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#setRunningVersion(boolean)
+ */
+ public void setRunningVersion(boolean runningVersion)
+ {
+ savedValue = value;
+ super.setRunningVersion(runningVersion);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.testelement.property.JMeterProperty#recoverRunningVersion(org.apache.jmeter.testelement.TestElement)
+ */
+ public void recoverRunningVersion(TestElement owner)
+ {
+ value = savedValue;
+ }
public void setValue(int value)
{
1.13 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Index: MapProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MapProperty.java 16 Aug 2003 10:06:56 -0000 1.12
+++ MapProperty.java 29 Sep 2003 14:56:01 -0000 1.13
@@ -174,7 +174,7 @@
public PropertyIterator valueIterator()
{
- return new PropertyIteratorImpl(value.values());
+ return getIterator(value.values());
}
public void addProperty(String name, JMeterProperty prop)
1.7 +2 -11 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MultiProperty.java
Index: MultiProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MultiProperty.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiProperty.java 16 Jul 2003 15:30:15 -0000 1.6
+++ MultiProperty.java 29 Sep 2003 14:56:01 -0000 1.7
@@ -92,15 +92,6 @@
*/
public abstract void clear();
- public void setTemporary(boolean temporary, TestElement owner)
- {
- super.setTemporary(temporary, owner);
- PropertyIterator iter = iterator();
- while (iter.hasNext())
- {
- iter.next().setTemporary(temporary, owner);
- }
- }
public void setRunningVersion(boolean running)
{
@@ -118,7 +109,7 @@
while (iter.hasNext())
{
JMeterProperty prop = iter.next();
- if (prop.isTemporary(owner) || prop.isTemporary(null))
+ if (owner.isTemporary(prop))
{
iter.remove();
}
1.4 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/NullProperty.java
Index: NullProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/NullProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NullProperty.java 28 Jun 2003 19:13:58 -0000 1.3
+++ NullProperty.java 29 Sep 2003 14:56:01 -0000 1.4
@@ -122,7 +122,6 @@
*/
public void recoverRunningVersion(TestElement owner)
{
- super.recoverRunningVersion(owner);
tempValue = null;
}
1.2 +9 -0 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
Index: PropertyIteratorImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyIteratorImpl.java 25 Mar 2003 17:24:34 -0000 1.1
+++ PropertyIteratorImpl.java 29 Sep 2003 14:56:01 -0000 1.2
@@ -19,6 +19,15 @@
iter = value.iterator();
}
+ public PropertyIteratorImpl()
+ {
+ }
+
+ public void setCollection(Collection value)
+ {
+ iter = value.iterator();
+ }
+
public boolean hasNext()
{
return iter.hasNext();
1.9 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/StringProperty.java
Index: StringProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/StringProperty.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StringProperty.java 16 Jul 2003 13:12:11 -0000 1.8
+++ StringProperty.java 29 Sep 2003 14:56:01 -0000 1.9
@@ -140,6 +140,5 @@
{
value = savedValue;
}
- super.recoverRunningVersion(owner);
}
}
1.12 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
Index: TestElementProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestElementProperty.java 16 Jul 2003 17:23:02 -0000 1.11
+++ TestElementProperty.java 29 Sep 2003 14:56:01 -0000 1.12
@@ -152,7 +152,6 @@
value = savedValue;
}
value.recoverRunningVersion();
- super.recoverRunningVersion(null);
}
/* (non-Javadoc)
1.45 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JMeterUtils.java 27 Sep 2003 23:51:04 -0000 1.44
+++ JMeterUtils.java 29 Sep 2003 14:56:01 -0000 1.45
@@ -98,7 +98,7 @@
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION = "1.9.20030922";
+ private static final String VERSION = "1.9.20030929";
private static PatternCacheLRU patternCache =
new PatternCacheLRU(1000, new Perl5Compiler());
1.51 +1 -2 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- HTTPSampler.java 18 Aug 2003 19:43:14 -0000 1.50
+++ HTTPSampler.java 29 Sep 2003 14:56:01 -0000 1.51
@@ -1046,7 +1046,6 @@
log.debug("Start : sample2");
long time = System.currentTimeMillis();
SampleResult res = new SampleResult();
- log.debug("#4, encoded path = " + getEncodedPath());
URL u = null;
try
{