Fix base type for interface proxies

Author: hazzik

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

@@ -0,0 +1,30 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH2067
+{
+	public interface ICat
+	{
+		Guid Id { get; set; }
+		string Name { get; set; }
+	}
+
+	public class Cat : ICat
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
+	public interface IPet
+	{
+		string OwnerName { get; set; }
+	}
+
+	public interface IDomesticCat : IPet, ICat
+	{
+	}
+
+	public sealed class DomesticCat : Cat, IDomesticCat
+	{
+		public string OwnerName { get; set; }
+	}
+}

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

@@ -0,0 +1,143 @@
+using System;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2067
+{
+	[TestFixture]
+	public class Fixture : TestCaseMappingByCode
+	{
+		private object domesticCatId;
+		private object catId;
+
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Cat>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+			});
+
+			mapper.JoinedSubclass<DomesticCat>(rc =>
+			{
+				rc.Proxy(typeof(IDomesticCat));
+				rc.Property(x => x.OwnerName);
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				catId = session.Save(new Cat { Name = "Bob" });
+
+				domesticCatId = session.Save(new DomesticCat {Name = "Tom", OwnerName = "Jerry"});
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void CanLoadDomesticCatUsingBaseClass()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<Cat>(domesticCatId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+		
+		[Test]
+		public void CanLoadDomesticCatUsingBaseClassInterface()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<ICat>(domesticCatId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+
+		[Test]
+		public void CanLoadDomesticCatUsingInterface()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<IDomesticCat>(domesticCatId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+
+		[Test]
+		public void ThrowWhenTryToLoadDomesticCatUsingSealedClass()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				Assert.Throws<InvalidCastException>(() => session.Load<DomesticCat>(domesticCatId));
+			}
+		}
+
+		[Test]
+		public void CanLoadDomesticCatUsingSealedClass()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = (IDomesticCat) session.Load(typeof(DomesticCat), domesticCatId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+
+		[Test]
+		public void CanLoadDomesticCatUsingSideInterface()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<IPet>(domesticCatId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+
+		[Test]
+		public void CanLoadCatUsingClass()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<Cat>(catId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+		
+		[Test]
+		public void CanLoadCatUsingInterface()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var cat = session.Load<ICat>(catId);
+				Assert.That(cat, Is.Not.Null);
+			}
+		}
+	}
+}

src/NHibernate/Proxy/StaticProxyFactory.cs

@@ -54,7 +54,21 @@ public override void PostInstantiate(
 				GetIdentifierMethod,
 				SetIdentifierMethod,
 				ComponentIdType);
-			_cacheEntry = new ProxyCacheEntry(IsClassProxy ? PersistentClass : typeof(object), Interfaces);
+			_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);
 		}
 
 		private Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy> CreateProxyActivator(ProxyCacheEntry pke)