Proper fix

hazzik · hazzik · commit 21c998c1cb38 · 2019-04-29T23:40:12.000+12:00
diff --git a/src/NHibernate/Type/EmbeddedComponentType.cs b/src/NHibernate/Type/EmbeddedComponentType.cs
@@ -19,9 +19,12 @@ public override bool IsEmbedded
 
 		public override object Instantiate(object parent, ISessionImplementor session)
 		{
-			bool useParent= false;
-			// NH Different implementation : since we are not sure about why H3.2 use the "parent"
-			//useParent = parent != null && base.ReturnedClass.IsInstanceOfType(parent);
+			var useParent =
+				parent != null &&
+				//TODO: Yuck! This is not quite good enough, it's a quick
+				//hack around the problem of having a to-one association
+				//that refers to an embedded component:
+				ReturnedClass.IsInstanceOfType(parent);
 
 			return useParent ? parent : base.Instantiate(parent, session);
 		}

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,12 @@ public override bool IsEmbedded`
`19`	`19`
`20`	`20`	`public override object Instantiate(object parent, ISessionImplementor session)`
`21`	`21`	`{`
`22`		`- bool useParent= false;`
`23`		`- // NH Different implementation : since we are not sure about why H3.2 use the "parent"`
`24`		`- //useParent = parent != null && base.ReturnedClass.IsInstanceOfType(parent);`
	`22`	`+ var useParent =`
	`23`	`+ parent != null &&`
	`24`	`+ //TODO: Yuck! This is not quite good enough, it's a quick`
	`25`	`+ //hack around the problem of having a to-one association`
	`26`	`+ //that refers to an embedded component:`
	`27`	`+ ReturnedClass.IsInstanceOfType(parent);`
`25`	`28`
`26`	`29`	`return useParent ? parent : base.Instantiate(parent, session);`
`27`	`30`	`}`