Author: sebb
Date: Fri Dec 31 03:36:09 2010
New Revision: 1054045
URL: http://svn.apache.org/viewvc?rev=1054045&view=rev
Log:
Add missing hashCode() methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java?rev=1054045&r1=1054044&r2=1054045&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
Fri Dec 31 03:36:09 2010
@@ -62,6 +62,15 @@ public class FunctionProperty extends Ab
return false;
}
+ @Override
+ public int hashCode(){
+ int hash = super.hashCode();
+ if (function != null) {
+ hash = hash*37 + function.hashCode();
+ }
+ return hash;
+ }
+
/**
* Executes the function (and caches the value for the duration of the test
* iteration) if the property is a running version. Otherwise, the raw
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java?rev=1054045&r1=1054044&r2=1054045&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Fri Dec 31 03:36:09 2010
@@ -52,6 +52,15 @@ public class MapProperty extends MultiPr
return false;
}
+ @Override
+ public int hashCode(){
+ int hash = super.hashCode();
+ if (value != null) {
+ hash = hash*37 + value.hashCode();
+ }
+ return hash;
+ }
+
/** {...@inheritdoc} */
public void setObjectValue(Object v) {
if (v instanceof Map<?, ?>) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java?rev=1054045&r1=1054044&r2=1054045&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java Fri
Dec 31 03:36:09 2010
@@ -177,6 +177,8 @@ public class Sample implements Serializa
return ((count - oo.count) < 0 ? -1 : (count == oo.count ? 0 : 1));
}
+ // TODO should equals and hashCode depend on field other than count?
+
@Override
public boolean equals(Object o){
return (
@@ -184,6 +186,12 @@ public class Sample implements Serializa
(this.compareTo((Sample) o) == 0)
);
}
+
+ @Override
+ public int hashCode(){
+ return (int)(count ^ (count >>> 32));
+ }
+
/**
* @return Returns the endTime.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
