[Hibernate-commits] Hibernate3/src/org/hibernate/type EntityType.java,1.54,1.55

[<epb...@us...>]

Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4307/src/org/hibernate/type

Modified Files:
	EntityType.java 
Log Message:
HHH-1489

Index: EntityType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/type/EntityType.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- EntityType.java	26 Oct 2005 21:33:07 -0000	1.54
+++ EntityType.java	15 Feb 2006 22:28:15 -0000	1.55
@@ -388,7 +388,7 @@
 	
 	public int getHashCode(Object x, EntityMode entityMode, SessionFactoryImplementor factory) {
 		EntityPersister persister = factory.getEntityPersister(associatedEntityName);
-		if ( !persister.hasIdentifierPropertyOrEmbeddedCompositeIdentifier() ) {
+		if ( !persister.canExtractIdOutOfEntity() ) {
 			return super.getHashCode(x, entityMode);
 		}
 		
@@ -404,7 +404,7 @@
 	
 	public boolean isEqual(Object x, Object y, EntityMode entityMode, SessionFactoryImplementor factory) {
 		EntityPersister persister = factory.getEntityPersister(associatedEntityName);
-		if ( !persister.hasIdentifierPropertyOrEmbeddedCompositeIdentifier() ) {
+		if ( !persister.canExtractIdOutOfEntity() ) {
 			return super.isEqual(x, y, entityMode);
 		}