NH-3487 - Proposed fix

Author: JKeyser

src/NHibernate/Tuple/EntityModeToTuplizerMapping.cs

@@ -1,19 +1,29 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 using NHibernate.Util;
 
 namespace NHibernate.Tuple
 {
 	/// <summary> Centralizes handling of <see cref="EntityMode"/> to <see cref="ITuplizer"/> mappings. </summary>
 	[Serializable]
-	public abstract class EntityModeToTuplizerMapping
+	public abstract class EntityModeToTuplizerMapping : IDeserializationCallback
 	{
+
 		// NH-1660
 		private readonly IDictionary<EntityMode, ITuplizer> tuplizers
 												= new LinkedHashMap<EntityMode, ITuplizer>(5, new EntityModeEqualityComparer());
+		[NonSerialized()]
+		private bool isFullyDeserialized = false;
+
+		public EntityModeToTuplizerMapping()
+		{
+			isFullyDeserialized = true;
+		}
 
 		protected internal void AddTuplizer(EntityMode entityMode, ITuplizer tuplizer)
 		{
+			EnsureFullyDeserialized();
 			tuplizers[entityMode] = tuplizer;
 		}
 
@@ -22,6 +32,7 @@ protected internal void AddTuplizer(EntityMode entityMode, ITuplizer tuplizer)
 		/// <returns> The guessed entity mode. </returns>
 		public virtual EntityMode? GuessEntityMode(object obj)
 		{
+			EnsureFullyDeserialized();
 			foreach (KeyValuePair<EntityMode, ITuplizer> entry in tuplizers)
 			{
 				ITuplizer tuplizer = entry.Value;
@@ -41,6 +52,7 @@ protected internal void AddTuplizer(EntityMode entityMode, ITuplizer tuplizer)
 		/// <returns> The tuplizer, or null if not found. </returns>
 		public virtual ITuplizer GetTuplizerOrNull(EntityMode entityMode)
 		{
+			EnsureFullyDeserialized();
 			ITuplizer result;
 			tuplizers.TryGetValue(entityMode, out result);
 			return result;
@@ -65,5 +77,19 @@ public virtual ITuplizer GetTuplizer(EntityMode entityMode)
 			}
 			return tuplizer;
 		}
+
+		private void EnsureFullyDeserialized()
+		{
+			if (!isFullyDeserialized)
+			{
+				((IDeserializationCallback)this).OnDeserialization(this);
+			}
+		}
+
+		void IDeserializationCallback.OnDeserialization(object sender)
+		{
+			((IDeserializationCallback)tuplizers).OnDeserialization(sender);
+			isFullyDeserialized = true;
+		}
 	}
 }

src/NHibernate/Util/LinkedHashMap.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.Serialization;
 using System.Text;
 using NHibernate.DebugHelpers;
 
@@ -18,7 +19,7 @@ namespace NHibernate.Util
 	/// </remarks>
 	[DebuggerTypeProxy(typeof(CollectionProxy<>))]
 	[Serializable]
-	public class LinkedHashMap<TKey, TValue> : IDictionary<TKey, TValue>
+	public class LinkedHashMap<TKey, TValue> : IDictionary<TKey, TValue>, IDeserializationCallback
 	{
 		[Serializable]
 		protected class Entry
@@ -359,6 +360,11 @@ private bool RemoveImpl(TKey key)
 			return result;
 		}
 
+		void IDeserializationCallback.OnDeserialization(object sender)
+		{
+			((IDeserializationCallback)entries).OnDeserialization(sender);
+		}
+
 		#region System.Object Members
 
 		public override string ToString()