Fix property replacement if needed inside component

Author: hazzik

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

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Dynamic
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		public override string BugNumber => "NH1039Dynamic";
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				s.Delete("from Person");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void Test()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				var person = new Person("1")
+				{
+					Name = "John Doe",
+					Properties =
+					{
+						Phones = new HashSet<object> {"555-1234", "555-4321"}
+					}
+				};
+
+				s.Save(person);
+				tx.Commit();
+			}
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var person = (Person) s.CreateCriteria(typeof(Person)).UniqueResult();
+
+				Assert.That(person.ID, Is.EqualTo("1"));
+				Assert.That(person.Name, Is.EqualTo("John Doe"));
+				var phones = person.Properties.Phones as ISet<object>;
+				Assert.That(phones, Is.Not.Null);
+				Assert.That(phones.Contains("555-1234"), Is.True);
+				Assert.That(phones.Contains("555-4321"), Is.True);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   namespace="NHibernate.Test.NHSpecificTest.NH1039Dynamic"
+				   assembly="NHibernate.Test">
+
+	<class name="Person" table="NH1039_Person">
+		<id name="ID" type="string" length="32">
+			<generator class="assigned"/>
+		</id>
+
+		<property name="Name"/>
+
+		<dynamic-component name="Properties">
+			<set name="Phones" table="NH1039_Phone">
+				<key column="PersonId"/>
+				<element column="`Number`" type="string"/>
+			</set>
+		</dynamic-component>
+	</class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1039Dynamic/Model.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Dynamic
+{
+	public class Person
+	{
+		public Person()
+		{
+		}
+
+		public Person(string id)
+		{
+			ID = id;
+		}
+
+		public virtual string ID { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual dynamic Properties { get; set; } = new ExpandoObject();
+	}
+}

src/NHibernate/Properties/MapAccessor.cs

@@ -22,6 +22,9 @@ public class MapAccessor : IPropertyAccessor
 		[Serializable]
 		public sealed class MapSetter : ISetter
 		{
+			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>> SetMemberSites =
+				new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>>();
+
 			private readonly string _name;
 
 			internal MapSetter(string name) => _name = name;
@@ -32,15 +35,39 @@ public sealed class MapSetter : ISetter
 
 			public void Set(object target, object value)
 			{
-				((IDictionary) target)[_name] = value;
+				switch (target)
+				{
+					case IDictionary d:
+						d[_name] = value;
+						break;
+					case IDictionary<string, object> d:
+						d[_name] = value;
+						break;
+					default:
+						var site = SetMemberSites.GetOrAdd(
+							System.Tuple.Create(target.GetType(), _name),
+							t => CallSite<Func<CallSite, object, object, object>>.Create(
+								Binder.GetMember(
+									CSharpBinderFlags.None,
+									t.Item2,
+									t.Item1,
+									new[]
+									{
+										CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null),
+										CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)
+									})));
+
+						site.Target(site, target, value);
+						break;
+				}
 			}
 		}
 
 		[Serializable]
 		public sealed class MapGetter : IGetter
 		{
-			private static readonly ConcurrentDictionary<string, CallSite<Func<CallSite, object, object>>> GetMemberSites =
-				new ConcurrentDictionary<string, CallSite<Func<CallSite, object, object>>>();
+			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>> GetMemberSites =
+				new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>>();
 
 			private readonly string _name;
 
@@ -65,12 +92,12 @@ public object Get(object target)
 						return result;
 					default:
 						var site = GetMemberSites.GetOrAdd(
-							_name,
-							name => CallSite<Func<CallSite, object, object>>.Create(
+							System.Tuple.Create(target.GetType(), _name),
+							t => CallSite<Func<CallSite, object, object>>.Create(
 								Binder.GetMember(
 									CSharpBinderFlags.None,
-									name,
-									target.GetType(),
+									t.Item2,
+									t.Item1,
 									new[] {CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)})));
 
 						return site.Target(site, target);