Always use PersistentClass as a base class for proxy

Change invocation of IProxyFactory.PostInstantiate to pass correct base
class depending on the set interface proxy

Author: hazzik

src/NHibernate.Test/NHSpecificTest/GH2067/Fixture.cs

@@ -61,6 +61,10 @@ public void CanLoadDomesticCatUsingBaseClass()
 			{
 				var cat = session.Load<Cat>(domesticCatId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Tom"));
+				var domesticCat = (IDomesticCat) cat;
+				Assert.That(domesticCat.Name, Is.EqualTo("Tom"));
+				Assert.That(domesticCat.OwnerName, Is.EqualTo("Jerry"));
 			}
 		}
 
@@ -72,6 +76,10 @@ public void CanLoadDomesticCatUsingBaseClassInterface()
 			{
 				var cat = session.Load<ICat>(domesticCatId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Tom"));
+				var domesticCat = (IDomesticCat) cat;
+				Assert.That(domesticCat.Name, Is.EqualTo("Tom"));
+				Assert.That(domesticCat.OwnerName, Is.EqualTo("Jerry"));
 			}
 		}
 
@@ -83,6 +91,8 @@ public void CanLoadDomesticCatUsingInterface()
 			{
 				var cat = session.Load<IDomesticCat>(domesticCatId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Tom"));
+				Assert.That(cat.OwnerName, Is.EqualTo("Jerry"));
 			}
 		}
 
@@ -104,6 +114,8 @@ public void CanLoadDomesticCatUsingSealedClass()
 			{
 				var cat = (IDomesticCat) session.Load(typeof(DomesticCat), domesticCatId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Tom"));
+				Assert.That(cat.OwnerName, Is.EqualTo("Jerry"));
 			}
 		}
 
@@ -115,6 +127,7 @@ public void CanLoadDomesticCatUsingSideInterface()
 			{
 				var cat = session.Load<IPet>(domesticCatId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.OwnerName, Is.EqualTo("Jerry"));
 			}
 		}
 
@@ -126,6 +139,7 @@ public void CanLoadCatUsingClass()
 			{
 				var cat = session.Load<Cat>(catId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Bob"));
 			}
 		}
 
@@ -137,6 +151,7 @@ public void CanLoadCatUsingInterface()
 			{
 				var cat = session.Load<ICat>(catId);
 				Assert.That(cat, Is.Not.Null);
+				Assert.That(cat.Name, Is.EqualTo("Bob"));
 			}
 		}
 	}

src/NHibernate/Proxy/StaticProxyFactory.cs

@@ -54,21 +54,7 @@ public override void PostInstantiate(
 				GetIdentifierMethod,
 				SetIdentifierMethod,
 				ComponentIdType);
-			_cacheEntry = new ProxyCacheEntry(GetProxyBaseType(PersistentClass), Interfaces);
-		}
-
-		private static System.Type GetProxyBaseType(System.Type type)
-		{
-			if (type.IsClass)
-			{
-				for (var t = type; t != null; t = t.BaseType)
-				{
-					if (!t.IsSealed)
-						return t;
-				}
-			}
-
-			return typeof(object);
+			_cacheEntry = new ProxyCacheEntry(PersistentClass, Interfaces);
 		}
 
 		private Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy> CreateProxyActivator(ProxyCacheEntry pke)

src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs

@@ -108,10 +108,9 @@ protected override IInstantiator BuildInstantiator(PersistentClass persistentCla
 			}
 		}
 
-		protected override IProxyFactory BuildProxyFactory(PersistentClass persistentClass, IGetter idGetter,
-		                                                            ISetter idSetter)
+		protected override IProxyFactory BuildProxyFactory(PersistentClass persistentClass, IGetter idGetter, ISetter idSetter)
 		{
-			bool needAccesorCheck = true; // NH specific (look the comment below)
+			bool isInterface = false; // NH specific (look the comment below)
 
 			// determine the id getter and setter methods from the proxy interface (if any)
 			// determine all interfaces needed by the resulting proxy
@@ -120,27 +119,27 @@ protected override IProxyFactory BuildProxyFactory(PersistentClass persistentCla
 			System.Type _mappedClass = persistentClass.MappedClass;
 			System.Type _proxyInterface = persistentClass.ProxyInterface;
 
-			if (_proxyInterface != null && !_mappedClass.Equals(_proxyInterface))
+			if (_proxyInterface != null && _mappedClass != _proxyInterface)
 			{
 				if (!_proxyInterface.IsInterface)
 				{
 					throw new MappingException("proxy must be either an interface, or the class itself: " + EntityName);
 				}
-				needAccesorCheck = false; // NH (the proxy is an interface all properties can be overridden)
+				isInterface = true; // NH (the proxy is an interface all properties can be overridden)
 				proxyInterfaces.Add(_proxyInterface);
 			}
 
 			if (_mappedClass.IsInterface)
 			{
-				needAccesorCheck = false; // NH (the mapped class is an interface all properties can be overridden)
+				isInterface = true; // NH (the mapped class is an interface all properties can be overridden)
 				proxyInterfaces.Add(_mappedClass);
 			}
 
 			foreach (Subclass subclass in persistentClass.SubclassIterator)
 			{
 				System.Type subclassProxy = subclass.ProxyInterface;
 				System.Type subclassClass = subclass.MappedClass;
-				if (subclassProxy != null && !subclassClass.Equals(subclassProxy))
+				if (subclassProxy != null && subclassClass != subclassProxy)
 				{
 					if (!subclassProxy.IsInterface)
 					{
@@ -155,7 +154,7 @@ protected override IProxyFactory BuildProxyFactory(PersistentClass persistentCla
 			 * - Check if the logger is enabled
 			 * - Don't need nothing to check if the mapped-class or proxy is an interface
 			 */
-			if (log.IsErrorEnabled() && needAccesorCheck)
+			if (!isInterface && log.IsErrorEnabled())
 			{
 				LogPropertyAccessorsErrors(persistentClass);
 			}
@@ -173,8 +172,15 @@ protected override IProxyFactory BuildProxyFactory(PersistentClass persistentCla
 			IProxyFactory pf = BuildProxyFactoryInternal(persistentClass, idGetter, idSetter);
 			try
 			{
-				pf.PostInstantiate(EntityName, _mappedClass, proxyInterfaces, proxyGetIdentifierMethod, proxySetIdentifierMethod,
-				                   persistentClass.HasEmbeddedIdentifier ? (IAbstractComponentType) persistentClass.Identifier.Type: null);
+				pf.PostInstantiate(
+					EntityName,
+					isInterface ? typeof(object) : _mappedClass,
+					proxyInterfaces,
+					proxyGetIdentifierMethod,
+					proxySetIdentifierMethod,
+					persistentClass.HasEmbeddedIdentifier
+						? (IAbstractComponentType) persistentClass.Identifier.Type
+						: null);
 			}
 			catch (HibernateException he)
 			{