[hibernate-commits] Hibernate SVN: r10244 - trunk/Hibernate3/src/org/hibernate/mapping

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-08-11 14:33:27 -0400 (Fri, 11 Aug 2006)
New Revision: 10244

Modified:
   trunk/Hibernate3/src/org/hibernate/mapping/Property.java
Log:
HHH-1740 : many-to-one (and one-to-one) with lazy="proxy" and bytecode instrumentation

Modified: trunk/Hibernate3/src/org/hibernate/mapping/Property.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/mapping/Property.java	2006-08-11 04:58:44 UTC (rev 10243)
+++ trunk/Hibernate3/src/org/hibernate/mapping/Property.java	2006-08-11 18:33:27 UTC (rev 10244)
@@ -201,7 +201,8 @@
 			// interception.  So we need to make sure that we return
 			// true here for the case of many-to-one and one-to-one
 			// with lazy="no-proxy"
-			return ( ( ToOne ) value ).isLazy();
+			ToOne toOneValue = ( ToOne ) value;
+			return toOneValue.isLazy() && toOneValue.isUnwrapProxy();
 		}
 		return lazy;
 	}