[hibernate-commits] Hibernate SVN: r10593 - trunk/Hibernate3/src/org/hibernate/impl

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-10-17 17:16:52 -0400 (Tue, 17 Oct 2006)
New Revision: 10593

Modified:
   trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java
Log:
HHH-1663 : <any/> mappings during flush

Modified: trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java	2006-10-17 17:25:55 UTC (rev 10592)
+++ trunk/Hibernate3/src/org/hibernate/impl/SessionImpl.java	2006-10-17 21:16:52 UTC (rev 10593)
@@ -1719,7 +1719,13 @@
 
 	public String bestGuessEntityName(Object object) {
 		if (object instanceof HibernateProxy) {
-			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation();
+			LazyInitializer initializer = ( ( HibernateProxy ) object ).getHibernateLazyInitializer();
+			// it is possible for this method to be called during flush processing,
+			// so make certain that we do not accidently initialize an uninitialized proxy
+			if ( initializer.isUninitialized() ) {
+				return initializer.getEntityName();
+			}
+			object = initializer.getImplementation();
 		}
 		EntityEntry entry = persistenceContext.getEntry(object);
 		if (entry==null) {