[Hibernate-commits] Hibernate Code SVN: r10143 - branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity

[<hib...@li...>]

Author: epbernard
Date: 2006-07-24 13:56:29 -0400 (Mon, 24 Jul 2006)
New Revision: 10143

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/AbstractEntityTuplizer.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/EntityMetamodel.java
Log:
HHH-1937 set class to lazy false if proxy factory creation fails

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/AbstractEntityTuplizer.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/AbstractEntityTuplizer.java	2006-07-24 17:56:10 UTC (rev 10142)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/AbstractEntityTuplizer.java	2006-07-24 17:56:29 UTC (rev 10143)
@@ -133,6 +133,9 @@
 
 		if ( entityMetamodel.isLazy() ) {
 			proxyFactory = buildProxyFactory( mappingInfo, idGetter, idSetter );
+			if (proxyFactory == null) {
+				entityMetamodel.setLazy( false );
+			}
 		}
 		else {
 			proxyFactory = null;

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/EntityMetamodel.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/EntityMetamodel.java	2006-07-24 17:56:10 UTC (rev 10142)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/tuple/entity/EntityMetamodel.java	2006-07-24 17:56:29 UTC (rev 10143)
@@ -78,7 +78,7 @@
 
 	private final int[] naturalIdPropertyNumbers;
 
-	private final boolean lazy;
+	private boolean lazy; //not final because proxy factory creation can fail
 	private final boolean hasCascades;
 	private final boolean mutable;
 	private final boolean isAbstract;
@@ -420,6 +420,10 @@
 		return lazy;
 	}
 
+	public void setLazy(boolean lazy) {
+		this.lazy = lazy;
+	}
+
 	public boolean isVersioned() {
 		return versioned;
 	}