From: <epb...@us...> - 2006-02-15 22:28:30
|
Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/persister/entity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4307/src/org/hibernate/persister/entity Modified Files: AbstractEntityPersister.java EntityPersister.java Log Message: HHH-1489 Index: AbstractEntityPersister.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- AbstractEntityPersister.java 14 Feb 2006 03:23:55 -0000 1.29 +++ AbstractEntityPersister.java 15 Feb 2006 22:28:15 -0000 1.30 @@ -90,7 +90,7 @@ * @author Gavin King */ public abstract class AbstractEntityPersister - implements OuterJoinLoadable, Queryable, ClassMetadata, UniqueKeyLoadable, + implements OuterJoinLoadable, Queryable, ClassMetadata, UniqueKeyLoadable, SQLLoadable, LazyPropertyInitializer, PostInsertIdentityPersister { private static final Log log = LogFactory.getLog( AbstractEntityPersister.class ); @@ -162,7 +162,7 @@ private final String[] subclassFormulaTemplateClosure; private final String[] subclassFormulaAliasClosure; [...986 lines suppressed...] return getTuplizer( entityMode ).getPropertyValue( object, propertyName ); } - + public Serializable getIdentifier(Object object, EntityMode entityMode) throws HibernateException { return getTuplizer( entityMode ).getIdentifier( object ); @@ -3460,9 +3464,9 @@ else { String subclassEntityName = getSubclassEntityName( clazz ); if ( subclassEntityName == null ) { - throw new HibernateException( - "instance not of expected entity type: " + clazz.getName() + - " is not a: " + getEntityName() + throw new HibernateException( + "instance not of expected entity type: " + clazz.getName() + + " is not a: " + getEntityName() ); } else { Index: EntityPersister.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/persister/entity/EntityPersister.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- EntityPersister.java 14 Feb 2006 03:23:55 -0000 1.24 +++ EntityPersister.java 15 Feb 2006 22:28:15 -0000 1.25 @@ -154,7 +154,7 @@ /** * Do detached instances of this class carry their own identifier value? */ - public boolean hasIdentifierPropertyOrEmbeddedCompositeIdentifier(); + public boolean canExtractIdOutOfEntity(); /** * Are instances of this class versioned by a timestamp or version number column. |