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 2009/09/21 16:45:35 UTC
svn commit: r817274 -
/openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Author: dwoods
Date: Mon Sep 21 14:45:35 2009
New Revision: 817274
URL: http://svn.apache.org/viewvc?rev=817274&view=rev
Log:
OPENJPA-1319 Incorrect hashcode()/equals() implementations - EntityManagerImpl. Patch contributed by Tim McConnell.
Modified:
openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=817274&r1=817273&r2=817274&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Mon Sep 21 14:45:35 2009
@@ -1230,13 +1230,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);
}