FIX NH-2898: Fix CastException when assembling object from 2nd level cache with lazy properties

stuartcarnie · hazzik · commit bb1d5fb050ce · 2012-05-23T23:13:51.000+06:00
(cherry picked from commit d01cdfb)
diff --git a/src/NHibernate/Engine/ForeignKeys.cs b/src/NHibernate/Engine/ForeignKeys.cs
@@ -177,7 +177,7 @@ public static bool IsNotTransient(string entityName, System.Object entity, bool?
 		/// </remarks>
 		public static bool IsTransient(string entityName, object entity, bool? assumed, ISessionImplementor session)
 		{
-			if (entity == Intercept.LazyPropertyInitializer.UnfetchedProperty)
+			if (Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, entity))
 			{
 				// an unfetched association can only point to
 				// an entity that already exists in the db
diff --git a/src/NHibernate/Engine/TwoPhaseLoad.cs b/src/NHibernate/Engine/TwoPhaseLoad.cs
@@ -74,7 +74,7 @@ public static void InitializeEntity(object entity, bool readOnly, ISessionImplem
 			for (int i = 0; i < hydratedState.Length; i++)
 			{
 				object value = hydratedState[i];
-				if (value != LazyPropertyInitializer.UnfetchedProperty && value != BackrefPropertyAccessor.Unknown)
+				if (!Equals(LazyPropertyInitializer.UnfetchedProperty, value) && !(Equals(BackrefPropertyAccessor.Unknown, value)))
 				{
 					hydratedState[i] = types[i].ResolveIdentifier(value, session, entity);
 				}
diff --git a/src/NHibernate/Event/Default/AbstractVisitor.cs b/src/NHibernate/Event/Default/AbstractVisitor.cs
@@ -129,7 +129,7 @@ internal virtual bool IncludeEntityProperty(object[] values, int i)
 
 		internal bool IncludeProperty(object[] values, int i)
 		{
-			return values[i] != Intercept.LazyPropertyInitializer.UnfetchedProperty;
+			return !Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, values[i]);
 		}
 	}
 }
diff --git a/src/NHibernate/Intercept/ILazyPropertyInitializer.cs b/src/NHibernate/Intercept/ILazyPropertyInitializer.cs
@@ -1,11 +1,12 @@
+using System;
 using NHibernate.Engine;
 
 namespace NHibernate.Intercept
 {
 	public struct LazyPropertyInitializer
 	{
 		/// <summary> Marker value for uninitialized properties</summary>
-		public readonly static object UnfetchedProperty= new object();
+		public readonly static object UnfetchedProperty = new Guid(0x8cbd57d5, 0xe58, 0x48a6, 0xa8, 0xf3, 0xec, 0xd4, 0xc2, 0x16, 0x35, 0xee);
 	}
 
 	/// <summary> Contract for controlling how lazy properties get initialized. </summary>
diff --git a/src/NHibernate/Properties/BackrefPropertyAccessor.cs b/src/NHibernate/Properties/BackrefPropertyAccessor.cs
@@ -9,7 +9,7 @@ namespace NHibernate.Properties
 	[Serializable]
 	public class BackrefPropertyAccessor : IPropertyAccessor
 	{
-		public static readonly object Unknown = new object();
+		public static readonly object Unknown = new Guid(0x3dbd938f, 0xb1f8, 0x4a98, 0xa2, 0xf9, 0x62, 0xbd, 0x3b, 0x2, 0x8d, 0xcf);
 		private readonly string propertyName;
 		private readonly string entityName;
 
diff --git a/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs b/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs
@@ -58,7 +58,7 @@ public override System.Type MappedClass
 		public override object[] GetPropertyValues(object component)
 		{
 			// NH Different behavior : for NH-1101
-			if (component == BackrefPropertyAccessor.Unknown || component == null)
+			if (Equals(BackrefPropertyAccessor.Unknown, component) || component == null)
 			{
 				return new object[propertySpan];
 			}
diff --git a/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs b/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs
@@ -275,7 +275,7 @@ public virtual void SetPropertyValues(object entity, object[] values)
 
 			for (int j = 0; j < entityMetamodel.PropertySpan; j++)
 			{
-				if (setAll || values[j] != LazyPropertyInitializer.UnfetchedProperty)
+				if (setAll || !Equals(LazyPropertyInitializer.UnfetchedProperty, values[j]))
 				{
 					setters[j].Set(entity, values[j]);
 				}
diff --git a/src/NHibernate/Type/TypeHelper.cs b/src/NHibernate/Type/TypeHelper.cs
@@ -24,7 +24,7 @@ public static void DeepCopy(object[] values, IType[] types, bool[] copy, object[
 			{
 				if (copy[i])
 				{
-					if (values[i] == LazyPropertyInitializer.UnfetchedProperty || values[i] == BackrefPropertyAccessor.Unknown)
+					if (Equals(LazyPropertyInitializer.UnfetchedProperty, values[i]) || Equals(BackrefPropertyAccessor.Unknown, values[i]))
 					{
 						target[i] = values[i];
 					}
@@ -44,7 +44,7 @@ public static void BeforeAssemble(object[] row, ICacheAssembler[] types, ISessio
 		{
 			for (int i = 0; i < types.Length; i++)
 			{
-				if (row[i] != LazyPropertyInitializer.UnfetchedProperty && row[i] != BackrefPropertyAccessor.Unknown)
+				if (!Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) && !Equals(BackrefPropertyAccessor.Unknown, row[i]))
 				{
 					types[i].BeforeAssemble(row[i], session);
 				}
@@ -64,7 +64,7 @@ public static object[] Assemble(object[] row, ICacheAssembler[] types, ISessionI
 			var assembled = new object[row.Length];
 			for (int i = 0; i < row.Length; i++)
 			{
-				if (row[i] == LazyPropertyInitializer.UnfetchedProperty || row[i] == BackrefPropertyAccessor.Unknown)
+				if (Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) || Equals(BackrefPropertyAccessor.Unknown, row[i]))
 				{
 					assembled[i] = row[i];
 				}
@@ -92,7 +92,7 @@ public static object[] Disassemble(object[] row, ICacheAssembler[] types, bool[]
 				{
 					disassembled[i] = LazyPropertyInitializer.UnfetchedProperty;
 				}
-				else if (row[i] == LazyPropertyInitializer.UnfetchedProperty || row[i] == BackrefPropertyAccessor.Unknown)
+				else if (Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) || Equals(BackrefPropertyAccessor.Unknown, row[i]))
 				{
 					disassembled[i] = row[i];
 				}
@@ -120,7 +120,7 @@ public static object[] Replace(object[] original, object[] target, IType[] types
 			var copied = new object[original.Length];
 			for (int i = 0; i < original.Length; i++)
 			{
-				if (original[i] == LazyPropertyInitializer.UnfetchedProperty || original[i] == BackrefPropertyAccessor.Unknown)
+				if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) || Equals(BackrefPropertyAccessor.Unknown, original[i]))
 				{
 					copied[i] = target[i];
 				}
@@ -150,7 +150,7 @@ public static object[] Replace(object[] original, object[] target, IType[] types
 			object[] copied = new object[original.Length];
 			for (int i = 0; i < types.Length; i++)
 			{
-				if (original[i] == LazyPropertyInitializer.UnfetchedProperty || original[i] == BackrefPropertyAccessor.Unknown)
+				if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) || Equals(BackrefPropertyAccessor.Unknown, original[i]))
 				{
 					copied[i] = target[i];
 				}
@@ -182,7 +182,7 @@ public static object[] ReplaceAssociations(object[] original, object[] target, I
 			object[] copied = new object[original.Length];
 			for (int i = 0; i < types.Length; i++)
 			{
-				if (original[i] == LazyPropertyInitializer.UnfetchedProperty || original[i] == BackrefPropertyAccessor.Unknown)
+				if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) || Equals(BackrefPropertyAccessor.Unknown, original[i]))
 				{
 					copied[i] = target[i];
 				}
@@ -239,7 +239,7 @@ public static int[] FindDirty(StandardProperty[] properties,
 			for (int i = 0; i < span; i++)
 			{
 				bool dirty =
-					currentState[i] != LazyPropertyInitializer.UnfetchedProperty &&
+					!Equals(LazyPropertyInitializer.UnfetchedProperty, currentState[i]) &&
 					properties[i].IsDirtyCheckable(anyUninitializedProperties)
 					&& properties[i].Type.IsDirty(previousState[i], currentState[i], includeColumns[i], session);
 
@@ -290,7 +290,7 @@ public static int[] FindModified(StandardProperty[] properties,
 			for (int i = 0; i < span; i++)
 			{
 				bool dirty =
-					currentState[i] != LazyPropertyInitializer.UnfetchedProperty &&
+					!Equals(LazyPropertyInitializer.UnfetchedProperty, currentState[i]) &&
 					properties[i].IsDirtyCheckable(anyUninitializedProperties)
 					&& properties[i].Type.IsModified(previousState[i], currentState[i], includeColumns[i], session);
 

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public static bool IsNotTransient(string entityName, System.Object entity, bool?`
`177`	`177`	`/// </remarks>`
`178`	`178`	`public static bool IsTransient(string entityName, object entity, bool? assumed, ISessionImplementor session)`
`179`	`179`	`{`
`180`		`- if (entity == Intercept.LazyPropertyInitializer.UnfetchedProperty)`
	`180`	`+ if (Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, entity))`
`181`	`181`	`{`
`182`	`182`	`// an unfetched association can only point to`
`183`	`183`	`// an entity that already exists in the db`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static void InitializeEntity(object entity, bool readOnly, ISessionImplem`
`74`	`74`	`for (int i = 0; i < hydratedState.Length; i++)`
`75`	`75`	`{`
`76`	`76`	`object value = hydratedState[i];`
`77`		`- if (value != LazyPropertyInitializer.UnfetchedProperty && value != BackrefPropertyAccessor.Unknown)`
	`77`	`+ if (!Equals(LazyPropertyInitializer.UnfetchedProperty, value) && !(Equals(BackrefPropertyAccessor.Unknown, value)))`
`78`	`78`	`{`
`79`	`79`	`hydratedState[i] = types[i].ResolveIdentifier(value, session, entity);`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ internal virtual bool IncludeEntityProperty(object[] values, int i)`
`129`	`129`
`130`	`130`	`internal bool IncludeProperty(object[] values, int i)`
`131`	`131`	`{`
`132`		`- return values[i] != Intercept.LazyPropertyInitializer.UnfetchedProperty;`
	`132`	`+ return !Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, values[i]);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
	`1`	`+using System;`
`1`	`2`	`using NHibernate.Engine;`
`2`	`3`
`3`	`4`	`namespace NHibernate.Intercept`
`4`	`5`	`{`
`5`	`6`	`public struct LazyPropertyInitializer`
`6`	`7`	`{`
`7`	`8`	`/// <summary> Marker value for uninitialized properties</summary>`
`8`		`- public readonly static object UnfetchedProperty= new object();`
	`9`	`+ public readonly static object UnfetchedProperty = new Guid(0x8cbd57d5, 0xe58, 0x48a6, 0xa8, 0xf3, 0xec, 0xd4, 0xc2, 0x16, 0x35, 0xee);`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`/// <summary> Contract for controlling how lazy properties get initialized. </summary>`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace NHibernate.Properties`
`9`	`9`	`[Serializable]`
`10`	`10`	`public class BackrefPropertyAccessor : IPropertyAccessor`
`11`	`11`	`{`
`12`		`- public static readonly object Unknown = new object();`
	`12`	`+ public static readonly object Unknown = new Guid(0x3dbd938f, 0xb1f8, 0x4a98, 0xa2, 0xf9, 0x62, 0xbd, 0x3b, 0x2, 0x8d, 0xcf);`
`13`	`13`	`private readonly string propertyName;`
`14`	`14`	`private readonly string entityName;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public override System.Type MappedClass`
`58`	`58`	`public override object[] GetPropertyValues(object component)`
`59`	`59`	`{`
`60`	`60`	`// NH Different behavior : for NH-1101`
`61`		`- if (component == BackrefPropertyAccessor.Unknown \|\| component == null)`
	`61`	`+ if (Equals(BackrefPropertyAccessor.Unknown, component) \|\| component == null)`
`62`	`62`	`{`
`63`	`63`	`return new object[propertySpan];`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public virtual void SetPropertyValues(object entity, object[] values)`
`275`	`275`
`276`	`276`	`for (int j = 0; j < entityMetamodel.PropertySpan; j++)`
`277`	`277`	`{`
`278`		`- if (setAll \|\| values[j] != LazyPropertyInitializer.UnfetchedProperty)`
	`278`	`+ if (setAll \|\| !Equals(LazyPropertyInitializer.UnfetchedProperty, values[j]))`
`279`	`279`	`{`
`280`	`280`	`setters[j].Set(entity, values[j]);`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static void DeepCopy(object[] values, IType[] types, bool[] copy, object[`
`24`	`24`	`{`
`25`	`25`	`if (copy[i])`
`26`	`26`	`{`
`27`		`- if (values[i] == LazyPropertyInitializer.UnfetchedProperty \|\| values[i] == BackrefPropertyAccessor.Unknown)`
	`27`	`+ if (Equals(LazyPropertyInitializer.UnfetchedProperty, values[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, values[i]))`
`28`	`28`	`{`
`29`	`29`	`target[i] = values[i];`
`30`	`30`	`}`
`@@ -44,7 +44,7 @@ public static void BeforeAssemble(object[] row, ICacheAssembler[] types, ISessio`
`44`	`44`	`{`
`45`	`45`	`for (int i = 0; i < types.Length; i++)`
`46`	`46`	`{`
`47`		`- if (row[i] != LazyPropertyInitializer.UnfetchedProperty && row[i] != BackrefPropertyAccessor.Unknown)`
	`47`	`+ if (!Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) && !Equals(BackrefPropertyAccessor.Unknown, row[i]))`
`48`	`48`	`{`
`49`	`49`	`types[i].BeforeAssemble(row[i], session);`
`50`	`50`	`}`
`@@ -64,7 +64,7 @@ public static object[] Assemble(object[] row, ICacheAssembler[] types, ISessionI`
`64`	`64`	`var assembled = new object[row.Length];`
`65`	`65`	`for (int i = 0; i < row.Length; i++)`
`66`	`66`	`{`
`67`		`- if (row[i] == LazyPropertyInitializer.UnfetchedProperty \|\| row[i] == BackrefPropertyAccessor.Unknown)`
	`67`	`+ if (Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, row[i]))`
`68`	`68`	`{`
`69`	`69`	`assembled[i] = row[i];`
`70`	`70`	`}`
`@@ -92,7 +92,7 @@ public static object[] Disassemble(object[] row, ICacheAssembler[] types, bool[]`
`92`	`92`	`{`
`93`	`93`	`disassembled[i] = LazyPropertyInitializer.UnfetchedProperty;`
`94`	`94`	`}`
`95`		`- else if (row[i] == LazyPropertyInitializer.UnfetchedProperty \|\| row[i] == BackrefPropertyAccessor.Unknown)`
	`95`	`+ else if (Equals(LazyPropertyInitializer.UnfetchedProperty, row[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, row[i]))`
`96`	`96`	`{`
`97`	`97`	`disassembled[i] = row[i];`
`98`	`98`	`}`
`@@ -120,7 +120,7 @@ public static object[] Replace(object[] original, object[] target, IType[] types`
`120`	`120`	`var copied = new object[original.Length];`
`121`	`121`	`for (int i = 0; i < original.Length; i++)`
`122`	`122`	`{`
`123`		`- if (original[i] == LazyPropertyInitializer.UnfetchedProperty \|\| original[i] == BackrefPropertyAccessor.Unknown)`
	`123`	`+ if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, original[i]))`
`124`	`124`	`{`
`125`	`125`	`copied[i] = target[i];`
`126`	`126`	`}`
`@@ -150,7 +150,7 @@ public static object[] Replace(object[] original, object[] target, IType[] types`
`150`	`150`	`object[] copied = new object[original.Length];`
`151`	`151`	`for (int i = 0; i < types.Length; i++)`
`152`	`152`	`{`
`153`		`- if (original[i] == LazyPropertyInitializer.UnfetchedProperty \|\| original[i] == BackrefPropertyAccessor.Unknown)`
	`153`	`+ if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, original[i]))`
`154`	`154`	`{`
`155`	`155`	`copied[i] = target[i];`
`156`	`156`	`}`
`@@ -182,7 +182,7 @@ public static object[] ReplaceAssociations(object[] original, object[] target, I`
`182`	`182`	`object[] copied = new object[original.Length];`
`183`	`183`	`for (int i = 0; i < types.Length; i++)`
`184`	`184`	`{`
`185`		`- if (original[i] == LazyPropertyInitializer.UnfetchedProperty \|\| original[i] == BackrefPropertyAccessor.Unknown)`
	`185`	`+ if (Equals(LazyPropertyInitializer.UnfetchedProperty, original[i]) \|\| Equals(BackrefPropertyAccessor.Unknown, original[i]))`
`186`	`186`	`{`
`187`	`187`	`copied[i] = target[i];`
`188`	`188`	`}`
`@@ -239,7 +239,7 @@ public static int[] FindDirty(StandardProperty[] properties,`
`239`	`239`	`for (int i = 0; i < span; i++)`
`240`	`240`	`{`
`241`	`241`	`bool dirty =`
`242`		`- currentState[i] != LazyPropertyInitializer.UnfetchedProperty &&`
	`242`	`+ !Equals(LazyPropertyInitializer.UnfetchedProperty, currentState[i]) &&`
`243`	`243`	`properties[i].IsDirtyCheckable(anyUninitializedProperties)`
`244`	`244`	`&& properties[i].Type.IsDirty(previousState[i], currentState[i], includeColumns[i], session);`
`245`	`245`
`@@ -290,7 +290,7 @@ public static int[] FindModified(StandardProperty[] properties,`
`290`	`290`	`for (int i = 0; i < span; i++)`
`291`	`291`	`{`
`292`	`292`	`bool dirty =`
`293`		`- currentState[i] != LazyPropertyInitializer.UnfetchedProperty &&`
	`293`	`+ !Equals(LazyPropertyInitializer.UnfetchedProperty, currentState[i]) &&`
`294`	`294`	`properties[i].IsDirtyCheckable(anyUninitializedProperties)`
`295`	`295`	`&& properties[i].Type.IsModified(previousState[i], currentState[i], includeColumns[i], session);`
`296`	`296`