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/27 17:01:16 UTC

svn commit: r1027992 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java

Author: dwoods
Date: Wed Oct 27 15:01:16 2010
New Revision: 1027992

URL: http://svn.apache.org/viewvc?rev=1027992&view=rev
Log:
OPENJPA-1316 Incorrect hashcode()/equals() implementation(s) in GeneratorImpl.  Patch contributed by Heath Thomann.

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

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java?rev=1027992&r1=1027991&r2=1027992&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java Wed Oct 27 15:01:16 2010
@@ -73,14 +73,17 @@ public class GeneratorImpl
     }
 
     public int hashCode() {
-        return _seq.hashCode();
+        return ((_seq == null) ? 0  : _seq.hashCode());
     }
 
     public boolean equals(Object other) {
         if (other == this)
             return true;
-        if (!(other instanceof GeneratorImpl))
+        if ((other == null) || (other.getClass() != this.getClass()))
             return false;
+        if (_seq == null)
+            return false;
+
         return _seq.equals(((GeneratorImpl) other)._seq);
-	}
+    }
 }