merge r3422 (NH-1268 fixed)

SVN: branches/2.0.x@3423
nhibernate · Mar 27, 2008 · 70c4359 · 70c4359
1 parent 09e4968
commit 70c4359
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
@@ -797,8 +797,6 @@ protected void BindAny(XmlNode node, Any model, bool isNullable)
 		private void BindOneToOne(XmlNode node, OneToOne model)
 		{
 			//BindColumns( node, model, isNullable, false, null, mappings );
-			InitOuterJoinFetchSetting(node, model);
-			InitLaziness(node, model, true);
 
 			XmlAttribute constrNode = node.Attributes["constrained"];
 			bool constrained = constrNode != null && constrNode.Value.Equals("true");
@@ -808,6 +806,9 @@ private void BindOneToOne(XmlNode node, OneToOne model)
 				? ForeignKeyDirection.ForeignKeyFromParent
 				: ForeignKeyDirection.ForeignKeyToParent);
 
+			InitOuterJoinFetchSetting(node, model);
+			InitLaziness(node, model, true);
+
 			XmlAttribute fkNode = node.Attributes["foreign-key"];
 			if (fkNode != null)
 				model.ForeignKeyName = fkNode.Value;