Message Title

Here's my workaround. I'm not saying this the the proper approach but at least I'm now avoiding similar situation as what Dave Radtke explained in

HHH-11147 Open where it's also explained why this - namely hasProxy() - doesn't work alone when enhancing is involved.

I may have very well overlooked things because DefaultLoadEventListener.onLoad does have options like checkDeleted, nakedEntityReturned, lockMode and allowProxyCreation, but on the other hand I've found that unWrapProxy was not respected. In my opinion these two codebases have so much similarity between them that in he end they should share code.

org/hibernate/type/EntityType.java b/src/org/hibernate/type/EntityType.java

@@ -16,6 +16,8 @@
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.engine.internal.ForeignKeys;
+import org.hibernate.engine.spi.EntityEntry;
+import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.EntityUniqueKey;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.PersistenceContext;
@@ -26,6 +28,7 @@
 import org.hibernate.persister.entity.Joinable;
 import org.hibernate.persister.entity.UniqueKeyLoadable;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 
 /**
  * Base for types which map associations to persistent entities.
@@ -696,16 +699,33 @@
 		final PersistenceContext persistenceContext = session.getPersistenceContext();
 		Object result = persistenceContext.getEntity( euk );
 		if ( result == null ) {
-			result = persister.loadByUniqueKey( uniqueKeyPropertyName, key, session );
-				
-			// If the entity was not in the Persistence Context, but was found now,
-			// add it to the Persistence Context
-			if (result != null) {
-				persistenceContext.addEntity(euk, result);
+			EntityKey entityKey = session.generateEntityKey( (Serializable) key, persister);
+			result = persistenceContext.getProxy( entityKey );
+			if ( result == null ) {
+				if ( persister.hasProxy() ) {
+					result = persister.createProxy( (Serializable) key, session );
+					persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( entityKey );
+					persistenceContext.addProxy( entityKey, result );
+				} else {
+					result = persister.loadByUniqueKey( uniqueKeyPropertyName, key, session );
+					
+						// If the entity was not in the Persistence Context, but was found now,
+						// add it to the Persistence Context
+					if (result != null) {
+						persistenceContext.addEntity(euk, result);
+					}
+				}
+			} else {
+				LazyInitializer li = ( (HibernateProxy) result ).getHibernateLazyInitializer();
+		        if ( li.isUnwrap() ) {
+		        	result = li.getImplementation();
+		        } else {
+		        	result = persistenceContext.narrowProxy( result, persister, entityKey, null);
+		        }
 			}
 		}
 
-		return result == null ? null : persistenceContext.proxyFor( result );
+		return result;
 	}
 
 }