svn commit: r817273 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

[dw...@apache.org]

Author: dwoods
Date: Mon Sep 21 14:43:58 2009
New Revision: 817273

URL: http://svn.apache.org/viewvc?rev=817273&view=rev
Log:
OPENJPA-1319 Incorrect hashcode()/equals() implementations - EntityManagerImpl.  Patch contributed by Tim McConnell.

Modified:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=817273&r1=817272&r2=817273&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Mon Sep 21 14:43:58 2009
@@ -1377,13 +1377,15 @@
     }
 
     public int hashCode() {
-        return _broker.hashCode();
+        return (_broker == null) ? 0 : _broker.hashCode();
     }
 
     public boolean equals(Object other) {
         if (other == this)
             return true;
-        if (!(other instanceof EntityManagerImpl))
+        if ((other == null) || (other.getClass() != this.getClass()))
+            return false;
+        if (_broker == null)
             return false;
         return _broker.equals(((EntityManagerImpl) other)._broker);
     }