svn commit: r1028452 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java

[dwoods]

Author: dwoods
Date: Thu Oct 28 19:58:31 2010
New Revision: 1028452

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

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

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java?rev=1028452&r1=1028451&r2=1028452&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
 Thu Oct 28 19:58:31 2010
@@ -104,14 +104,17 @@ public class ExtentImpl<T>
     }
 
     public int hashCode() {
-        return _extent.hashCode();
+        return ((_extent == null) ? 0  : _extent.hashCode());
     }
 
     public boolean equals(Object other) {
         if (other == this)
             return true;
-        if (!(other instanceof ExtentImpl))
+        if ((other == null) || (other.getClass() != this.getClass()))
             return false;
+        if (_extent == null)
+               return false;
+        
         return _extent.equals(((ExtentImpl) other)._extent);
        }
 }