jsalvata 2003/01/12 16:29:59
Modified: src/core/org/apache/jmeter/testelement
AbstractTestElement.java
Log:
Merging collections doesn't eliminate repetitions or change order of items in the
merged-in collection. This fixes main issue in bug#15687.
Revision Changes Path
1.5 +10 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractTestElement.java 13 Jan 2003 00:19:20 -0000 1.4
+++ AbstractTestElement.java 13 Jan 2003 00:29:59 -0000 1.5
@@ -346,7 +346,6 @@
}
else if(value instanceof Collection)
{
- Iterator iter2 = ((Collection)value).iterator();
Collection localCollection = (Collection)getProperty(key);
if(localCollection == null)
{
@@ -354,13 +353,21 @@
}
else
{
+ // Remove any repeated elements:
+ Iterator iter2 = ((Collection)value).iterator();
while(iter2.hasNext())
{
Object item = iter2.next();
if(!localCollection.contains(item))
{
- localCollection.add(item);
+ localCollection.remove(item);
}
+ }
+ // Add all elements now:
+ iter2 = ((Collection)value).iterator();
+ while(iter2.hasNext())
+ {
+ localCollection.add(iter2.next());
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
