Fix ExtractInterceptor for subclasses

src/NHibernate.Test/Async/NHSpecificTest/GH2508/AuditEventListener.cs

@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NHibernate.Cfg;
+using NHibernate.Event;
+using NHibernate.Persister.Entity;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	public partial class AuditEventListener :  IPreCollectionUpdateEventListener
+	{
+		public Task OnPreUpdateCollectionAsync(PreCollectionUpdateEvent @event, CancellationToken cancellationToken)
+		{
+			try
+			{
+				var ownerEntity = @event.AffectedOwnerOrNull;
+				var collectionEntry = @event.Session.PersistenceContext.GetCollectionEntry(@event.Collection);
+				if (!collectionEntry.LoadedPersister.IsInverse)
+					return Task.CompletedTask;
+
+				var abstractCollectionPersister = collectionEntry.LoadedPersister as Persister.Collection.AbstractCollectionPersister;
+				if (abstractCollectionPersister == null)
+					return Task.CompletedTask;
+
+				var ownerEntityPersister = abstractCollectionPersister.OwnerEntityPersister;
+				ownerEntityPersister.GetPropertyValues(ownerEntity);
+				return Task.CompletedTask;
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+	}
+}

src/NHibernate.Test/Async/NHSpecificTest/GH2508/Fixture.cs

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Linq;
+using NHibernate.Cfg;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			var listeners = configuration.EventListeners;
+			listeners.PreCollectionUpdateEventListeners =
+				new[] {new AuditEventListener()}
+					.Concat(listeners.PreCollectionUpdateEventListeners)
+					.ToArray();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new LoggerCase {Name = "Bob"};
+				session.Save(e1);
+
+				var e2 = new LoggerCase {Name = "Sally"};
+				session.Save(e2);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task TestPreCollectionUpdateEventAsync()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var result = await ((from e in session.Query<LoggerCase>()
+							  where e.Name == "Bob"
+							  select e).FirstAsync());
+
+				result.Children.Add(new Child { Logger = result, Name = "child" });
+				await (session.SaveOrUpdateAsync(result));
+				await (transaction.CommitAsync());
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2508/AuditEventListener.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NHibernate.Cfg;
+using NHibernate.Event;
+using NHibernate.Persister.Entity;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	public partial class AuditEventListener :  IPreCollectionUpdateEventListener
+	{
+		public void OnPreUpdateCollection(PreCollectionUpdateEvent @event)
+		{
+			var ownerEntity = @event.AffectedOwnerOrNull;
+			var collectionEntry = @event.Session.PersistenceContext.GetCollectionEntry(@event.Collection);
+			if (!collectionEntry.LoadedPersister.IsInverse)
+				return;
+
+			var abstractCollectionPersister = collectionEntry.LoadedPersister as Persister.Collection.AbstractCollectionPersister;
+			if (abstractCollectionPersister == null)
+				return;
+
+			var ownerEntityPersister = abstractCollectionPersister.OwnerEntityPersister;
+			ownerEntityPersister.GetPropertyValues(ownerEntity);
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2508/Child.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	public class Child 
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual LoggerBase Logger { get; set; }
+	}
+}

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

@@ -0,0 +1,60 @@
+using System.Linq;
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			var listeners = configuration.EventListeners;
+			listeners.PreCollectionUpdateEventListeners =
+				new[] {new AuditEventListener()}
+					.Concat(listeners.PreCollectionUpdateEventListeners)
+					.ToArray();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new LoggerCase {Name = "Bob"};
+				session.Save(e1);
+
+				var e2 = new LoggerCase {Name = "Sally"};
+				session.Save(e2);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void TestPreCollectionUpdateEvent()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var result = (from e in session.Query<LoggerCase>()
+							  where e.Name == "Bob"
+							  select e).First();
+
+				result.Children.Add(new Child { Logger = result, Name = "child" });
+				session.SaveOrUpdate(result);
+				transaction.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2508/LoggerBase.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	public abstract class LoggerBase
+	{
+		public LoggerBase()
+		{
+			Children = new List<Child>();
+		}
+
+		public virtual string Solution { get; set; }
+
+		public virtual Guid Id { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual IList<Child> Children { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2508/LoggerCase.cs

@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.GH2508
+{
+	public class LoggerCase : LoggerBase
+	{
+		public virtual string Description { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2508/Mappings.hbm.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH2508">
+
+  <class name="LoggerBase" abstract="true" polymorphism="implicit">
+    <id name="Id" generator="guid.comb"/>
+
+    <property name="Name"/>
+    <property name="Solution" type="StringClob" lazy="true"/>
+
+    <bag name="Children" cascade="all-delete-orphan" inverse="true">
+      <key column="LoggerBaseId"/>
+      <one-to-many class="Child"/>
+    </bag>
+
+    <joined-subclass name="LoggerCase">
+      <key column="Id" />
+      <property name="Description"/>
+    </joined-subclass>
+  </class>
+
+  <class name="Child">
+    <id name="Id" generator="guid.comb"/>
+
+    <many-to-one name="Logger" class="LoggerBase" column="LoggerBaseId" />
+    <property name="Name"/>
+  </class>
+</hibernate-mapping>

src/NHibernate/Tuple/Entity/BytecodeEnhancementMetadataPocoImpl.cs

@@ -132,7 +132,7 @@ public IFieldInterceptor InjectInterceptor(object entity, ISessionImplementor se
 				return null; // Can happen when a saved entity is refreshed within the same session NH2860
 			}
 
-			if (entity.GetType().BaseType != _entityType)
+			if (!_entityType.IsInstanceOfType(entity))
 			{
 				throw new ArgumentException(
 					$"Passed entity instance [{entity}] is not of expected type [{EntityName}]");
@@ -170,7 +170,7 @@ public IFieldInterceptor ExtractInterceptor(object entity)
 				return null;
 			}
 
-			if (_entityType != interceptor.MappedClass)
+			if (!_entityType.IsAssignableFrom(interceptor.MappedClass))
 			{
 				throw new ArgumentException(
 					$"Passed entity instance [{entity}] is not of expected type [{EntityName}]");