sebb 2004/02/18 14:43:34
Modified: src/core/org/apache/jmeter/testelement
AbstractTestElement.java
Log:
Add hashCode() to agree with equals() fix possible NPE on exception path
Revision Changes Path
1.29 +15 -9
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AbstractTestElement.java 13 Feb 2004 02:21:38 -0000 1.28
+++ AbstractTestElement.java 18 Feb 2004 22:43:34 -0000 1.29
@@ -59,16 +59,16 @@
try
{
clonedElement = (TestElement) this.getClass().newInstance();
+
+ PropertyIterator iter = propertyIterator();
+ while (iter.hasNext())
+ {
+ clonedElement.setProperty((JMeterProperty)
iter.next().clone());
+ }
+ clonedElement.setRunningVersion(runningVersion);
}
catch (Exception e)
{}
-
- PropertyIterator iter = propertyIterator();
- while (iter.hasNext())
- {
- clonedElement.setProperty((JMeterProperty) iter.next().clone());
- }
- clonedElement.setRunningVersion(runningVersion);
return clonedElement;
}
@@ -94,6 +94,12 @@
}
}
+ // Ensure equals agrees with hash
+ public int hashCode()
+ {
+ return propMap.hashCode();
+
+ }
public void addTestElement(TestElement el)
{
mergeIn(el);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
