You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/10/28 22:11:11 UTC

svn commit: r1028456 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java

Author: dwoods
Date: Thu Oct 28 20:11:11 2010
New Revision: 1028456

URL: http://svn.apache.org/viewvc?rev=1028456&view=rev
Log:
OPENJPA-1320 Incorrect hashcode()/equals() implementation(s) for BrokerImpl.  Patch contributed by Heath Thomann.

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=1028456&r1=1028455&r2=1028456&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java Thu Oct 28 20:11:11 2010
@@ -4903,8 +4903,9 @@ public class BrokerImpl
         public boolean equals(Object other) {
             if (other == this)
                 return true;
-            if (!(other instanceof StateManagerId))
+            if ((other == null) || (other.getClass() != this.getClass()))
                 return false;
+            
             StateManagerId sid = (StateManagerId) other;
             return _bhash == sid._bhash && _id == sid._id;
         }