Cease losing proxy initialized state on serialization

Author: fredericDelaporte

src/NHibernate.Test/StaticProxyTest/StaticProxyFactoryFixture.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
 using NHibernate.Proxy;
 using NUnit.Framework;
 
@@ -16,6 +19,12 @@ public class TestClass : ISomething
 			public virtual int Id { get; set; }
 		}
 
+		[Serializable]
+		public class SimpleTestClass
+		{
+			public virtual int Id { get; set; }
+		}
+
 		[Test]
 		public void CanCreateProxyForClassWithInternalInterface()
 		{
@@ -24,5 +33,57 @@ public void CanCreateProxyForClassWithInternalInterface()
 			var proxy = factory.GetProxy(1, null);
 			Assert.That(proxy, Is.Not.Null);
 		}
+
+		[Test]
+		public void InitializedProxyStaysInitializedAfterDeserialization()
+		{
+			var factory = new StaticProxyFactory();
+			factory.PostInstantiate(typeof(SimpleTestClass).FullName, typeof(SimpleTestClass), new HashSet<System.Type> {typeof(INHibernateProxy)}, null, null, null);
+			var proxy = factory.GetProxy(2, null);
+			Assert.That(proxy, Is.Not.Null, "proxy");
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy already initialized after creation");
+			Assert.That(proxy.HibernateLazyInitializer, Is.Not.Null, "HibernateLazyInitializer");
+
+			var impl = new SimpleTestClass { Id = 2 };
+			proxy.HibernateLazyInitializer.SetImplementation(impl);
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.True, "proxy not initialized after setting implementation");
+
+			var serializer = new BinaryFormatter();
+			object deserialized;
+			using (var memoryStream = new MemoryStream())
+			{
+				serializer.Serialize(memoryStream, proxy);
+				memoryStream.Seek(0L, SeekOrigin.Begin);
+				deserialized = serializer.Deserialize(memoryStream);
+			}
+			Assert.That(deserialized, Is.Not.Null, "deserialized");
+			Assert.That(deserialized, Is.InstanceOf<INHibernateProxy>());
+			Assert.That(NHibernateUtil.IsInitialized(deserialized), Is.True, "proxy no more initialized after deserialization");
+			Assert.That(deserialized, Is.InstanceOf<SimpleTestClass>());
+			Assert.That(((SimpleTestClass) deserialized).Id, Is.EqualTo(2));
+		}
+
+		[Test]
+		public void NonInitializedProxyStaysNonInitializedAfterSerialization()
+		{
+			var factory = new StaticProxyFactory();
+			factory.PostInstantiate(typeof(SimpleTestClass).FullName, typeof(SimpleTestClass), new HashSet<System.Type> {typeof(INHibernateProxy)}, null, null, null);
+			var proxy = factory.GetProxy(2, null);
+			Assert.That(proxy, Is.Not.Null, "proxy");
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy already initialized after creation");
+
+			var serializer = new BinaryFormatter();
+			object deserialized;
+			using (var memoryStream = new MemoryStream())
+			{
+				serializer.Serialize(memoryStream, proxy);
+				Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy initialized after serialization");
+				memoryStream.Seek(0L, SeekOrigin.Begin);
+				deserialized = serializer.Deserialize(memoryStream);
+			}
+			Assert.That(deserialized, Is.Not.Null, "deserialized");
+			Assert.That(deserialized, Is.InstanceOf<INHibernateProxy>());
+			Assert.That(NHibernateUtil.IsInitialized(deserialized), Is.False, "proxy initialized after deserialization");
+		}
 	}
 }

src/NHibernate/Proxy/NHibernateProxyBuilder.cs

@@ -24,6 +24,7 @@ internal class NHibernateProxyBuilder
 		private static readonly PropertyInfo LazyInitializerIdentifierProperty = LazyInitializerType.GetProperty(nameof(ILazyInitializer.Identifier));
 		private static readonly MethodInfo LazyInitializerInitializeMethod = LazyInitializerType.GetMethod(nameof(ILazyInitializer.Initialize));
 		private static readonly MethodInfo LazyInitializerGetImplementationMethod = LazyInitializerType.GetMethod(nameof(ILazyInitializer.GetImplementation), System.Type.EmptyTypes);
+		private static readonly PropertyInfo LazyInitializerIsUninitializedProperty = LazyInitializerType.GetProperty(nameof(ILazyInitializer.IsUninitialized));
 		private static readonly IProxyAssemblyBuilder ProxyAssemblyBuilder = new DefaultProxyAssemblyBuilder();
 
 		private static readonly ConstructorInfo SecurityCriticalAttributeConstructor = typeof(SecurityCriticalAttribute).GetConstructor(System.Type.EmptyTypes);
@@ -199,7 +200,12 @@ private static void ImplementGetObjectData(TypeBuilder typeBuilder, FieldInfo pr
 			IL.Emit(OpCodes.Call, ReflectionCache.TypeMethods.GetTypeFromHandle);
 			IL.Emit(OpCodes.Callvirt, SerializationInfoSetTypeMethod);
 
-			// (new NHibernateProxyObjectReference(this.__proxyInfo, this.__lazyInitializer.Identifier)).GetObjectData(info, context);
+			// return
+			// 	(new NHibernateProxyObjectReference(
+			// 		this.__proxyInfo,
+			// 		this.__lazyInitializer.Identifier),
+			// 		this.__lazyInitializer.IsUninitialized ? null : this.__lazyInitializer.GetImplementation())
+			// 	.GetObjectData(info, context);
 			//this.__proxyInfo
 			IL.Emit(OpCodes.Ldarg_0);
 			IL.Emit(OpCodes.Ldfld, proxyInfoField);
@@ -209,11 +215,27 @@ private static void ImplementGetObjectData(TypeBuilder typeBuilder, FieldInfo pr
 			IL.Emit(OpCodes.Ldfld, lazyInitializerField);
 			IL.Emit(OpCodes.Callvirt, LazyInitializerIdentifierProperty.GetMethod);
 
+			// this.__lazyInitializer.IsUninitialized ? null : this.__lazyInitializer.GetImplementation()
+			var isUnitialized = IL.DefineLabel();
+			var endIsUnitializedTernary = IL.DefineLabel();
+			IL.Emit(OpCodes.Ldarg_0);
+			IL.Emit(OpCodes.Ldfld, lazyInitializerField);
+			IL.Emit(OpCodes.Callvirt, LazyInitializerIsUninitializedProperty.GetMethod);
+			IL.Emit(OpCodes.Brtrue, isUnitialized);
+			IL.Emit(OpCodes.Ldarg_0);
+			IL.Emit(OpCodes.Ldfld, lazyInitializerField);
+			IL.Emit(OpCodes.Callvirt, LazyInitializerGetImplementationMethod);
+			IL.Emit(OpCodes.Br, endIsUnitializedTernary);
+			IL.MarkLabel(isUnitialized);
+			IL.Emit(OpCodes.Ldnull);
+			IL.MarkLabel(endIsUnitializedTernary);
+
 			var constructor = typeof(NHibernateProxyObjectReference).GetConstructor(
 				new[]
 				{
 					typeof(NHibernateProxyFactoryInfo),
 					typeof(object),
+					typeof(object)
 				});
 			IL.Emit(OpCodes.Newobj, constructor);
 

src/NHibernate/Proxy/NHibernateProxyObjectReference.cs

@@ -9,30 +9,51 @@ public sealed class NHibernateProxyObjectReference : IObjectReference, ISerializ
 	{
 		private readonly NHibernateProxyFactoryInfo _proxyFactoryInfo;
 		private readonly object _identifier;
+		private readonly object _implementation;
 
+		[Obsolete("Use overload taking an implementation parameter")]
 		public NHibernateProxyObjectReference(NHibernateProxyFactoryInfo proxyFactoryInfo, object identifier)
+			: this (proxyFactoryInfo, identifier, null)
+		{}
+
+		public NHibernateProxyObjectReference(NHibernateProxyFactoryInfo proxyFactoryInfo, object identifier, object implementation)
 		{
 			_proxyFactoryInfo = proxyFactoryInfo;
 			_identifier = identifier;
+			_implementation = implementation;
 		}
 
 		private NHibernateProxyObjectReference(SerializationInfo info, StreamingContext context)
 		{
 			_proxyFactoryInfo = (NHibernateProxyFactoryInfo) info.GetValue(nameof(_proxyFactoryInfo), typeof(NHibernateProxyFactoryInfo));
 			_identifier = info.GetValue(nameof(_identifier), typeof(object));
+			// 6.0 TODO: simplify with info.GetValue(nameof(_implementation), typeof(object));
+			foreach (var entry in info)
+			{
+				if (entry.Name == nameof(_implementation))
+				{
+					_implementation = entry.Value;
+				}
+			}
 		}
 
 		[SecurityCritical]
 		public object GetRealObject(StreamingContext context)
 		{
-			return _proxyFactoryInfo.CreateProxyFactory().GetProxy(_identifier, null);
+			var proxy = _proxyFactoryInfo.CreateProxyFactory().GetProxy(_identifier, null);
+
+			if (_implementation != null)
+				proxy.HibernateLazyInitializer.SetImplementation(_implementation);
+
+			return proxy;
 		}
 
 		[SecurityCritical]
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			info.AddValue(nameof(_proxyFactoryInfo), _proxyFactoryInfo);
 			info.AddValue(nameof(_identifier), _identifier);
+			info.AddValue(nameof(_implementation), _implementation);
 		}
 	}
 }