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 se...@apache.org on 2007/05/30 20:34:58 UTC
svn commit: r542902 - in /jakarta/jmeter/branches/rel-2-2:
src/core/org/apache/jmeter/testelement/AbstractTestElement.java
xdocs/changes.xml
Author: sebb
Date: Wed May 30 11:34:57 2007
New Revision: 542902
URL: http://svn.apache.org/viewvc?view=rev&rev=542902
Log:
Bug 42326 - Order of elements in .jmx files changes
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?view=diff&rev=542902&r1=542901&r2=542902
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Wed May 30 11:34:57 2007
@@ -20,8 +20,8 @@
import java.io.Serializable;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -47,7 +47,7 @@
public abstract class AbstractTestElement implements TestElement, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
- private Map propMap = Collections.synchronizedMap(new HashMap());
+ private Map propMap = Collections.synchronizedMap(new LinkedHashMap());
private transient Set temporaryProperties;
@@ -130,9 +130,6 @@
public JMeterProperty getProperty(String key) {
JMeterProperty prop = (JMeterProperty) propMap.get(key);
if (prop == null) {
- // TODO URGENT - does it make sense to create "different"
- // NullProperty items for each key?
- // Or would it be better to create them all with a key of "" ?
prop = new NullProperty(key);
}
return prop;
@@ -214,10 +211,12 @@
clearTemporary(property);
}
JMeterProperty prop = getProperty(property.getName());
+ removeProperty(property.getName());
if (prop instanceof NullProperty || (prop instanceof StringProperty && prop.getStringValue().equals(""))) {
propMap.put(property.getName(), property);
} else {
+ propMap.put(property.getName(), prop);
prop.mergeIn(property);
}
}
@@ -342,7 +341,7 @@
*/
public void setTemporary(JMeterProperty property) {
if (temporaryProperties == null) {
- temporaryProperties = new HashSet();
+ temporaryProperties = new LinkedHashSet();
}
temporaryProperties.add(property);
if (property instanceof MultiProperty) {
@@ -422,7 +421,6 @@
*/
public AbstractTestElement() {
super();
- // TODO Auto-generated constructor stub
}
// Default implementation
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=542902&r1=542901&r2=542902
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Wed May 30 11:34:57 2007
@@ -155,6 +155,7 @@
<li>Extract external jar definitions into build.properties file</li>
<li>Use specific jar names in build classpaths so errors are detected sooner</li>
<li>Tidied up ORO calls; now only one cache, size given by oro.patterncache.size, default 1000</li>
+<li>Bug 42326 - Order of elements in .jmx files changes</li>
</ul>
<h4>External jar updates:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org