mstover1 01/08/01 19:19:31
Modified: src/org/apache/jmeter/config AbstractConfigElement.java
Arguments.java
src/org/apache/jmeter/protocol/http/config UrlConfig.java
Log:
Fixing cloning issues.
Revision Changes Path
1.9 +2 -2
jakarta-jmeter/src/org/apache/jmeter/config/AbstractConfigElement.java
Index: AbstractConfigElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/config/AbstractConfigElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractConfigElement.java 2001/08/01 13:38:44 1.8
+++ AbstractConfigElement.java 2001/08/02 02:19:31 1.9
@@ -65,7 +65,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2001/08/01 13:38:44 $
+ *@created $Date: 2001/08/02 02:19:31 $
*@version 1.0
***********************************************************/
@@ -263,7 +263,7 @@
***********************************************************/
protected void configureClone(AbstractConfigElement newConfig)
{
- newConfig.addConfigElement(this);
+ newConfig.properties = (Map)((HashMap)properties).clone();
}
private void copyProperties(Map props)
1.11 +14 -2 jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java
Index: Arguments.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Arguments.java 2001/08/01 13:38:44 1.10
+++ Arguments.java 2001/08/02 02:19:31 1.11
@@ -64,11 +64,11 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/08/01 13:38:44 $
+ *@created $Date: 2001/08/02 02:19:31 $
*@version 1.0
***********************************************************/
-public class Arguments implements JMeterComponentModel,
Saveable,java.io.Serializable
+public class Arguments implements JMeterComponentModel,
Saveable,java.io.Serializable,Cloneable
{
public static String[] COLUMN_NAMES = {"Name", "Value"};
@@ -96,6 +96,18 @@
public void addJMeterComponent(JMeterComponentModel child)
{
+ }
+
+ public Object clone()
+ {
+ Arguments newArgs = new Arguments();
+ Iterator iter = args.iterator();
+ while (iter.hasNext())
+ {
+ Argument item = (Argument)iter.next();
+ newArgs.addArgument(item.getName(),item.getValue());
+ }
+ return newArgs;
}
/************************************************************
1.17 +3 -2
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java
Index: UrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- UrlConfig.java 2001/07/27 21:04:38 1.16
+++ UrlConfig.java 2001/08/02 02:19:31 1.17
@@ -65,8 +65,8 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/07/27 21:04:38 $
- *@version $Revision: 1.16 $
+ *@created $Date: 2001/08/02 02:19:31 $
+ *@version $Revision: 1.17 $
*/
public class UrlConfig extends AbstractConfigElement
@@ -382,6 +382,7 @@
{
UrlConfig newConfig = new UrlConfig();
configureClone(newConfig);
+ newConfig.putProperty(this.ARGUMENTS,this.getArguments().clone());
return newConfig;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]