NH-3234 - Fix inversion of identity-map

Author: hazzik

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

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3234
+{
+	public class GridLevel
+	{
+		public Guid Id { get; set; }
+	}
+
+	public class GridWidget
+	{
+		public GridWidget()
+		{
+			Levels = new List<GridLevel>();
+		}
+
+		public Guid Id { get; set; }
+
+		public ICollection<GridLevel> Levels { get; private set; }
+	}
+}

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

@@ -0,0 +1,91 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3234
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		private void Evict(ISession session, GridWidget widget)
+		{
+			session.Evict(widget);
+			sessions.Evict(widget.GetType());
+		}
+
+		private static void Save(ISession session, GridWidget widget)
+		{
+			if (widget.Id != Guid.Empty && !session.Contains(widget))
+				widget = session.Merge(widget);
+
+			session.SaveOrUpdate(widget);
+			session.Flush();
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session=OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void ShouldNotFailWhenAddingNewLevels()
+		{
+			using (var session = OpenSession())
+			{
+				var widget = new GridWidget
+					{
+						Levels =
+							{
+								new GridLevel(),
+								new GridLevel()
+							},
+					};
+
+				Save(session, widget);
+				Evict(session, widget);
+
+				widget.Levels.Add(new GridLevel());
+
+				Save(session, widget);
+				Evict(session, widget);
+
+				var loaded = session.Get<GridWidget>(widget.Id);
+
+				Assert.That(loaded.Levels.Count, Is.EqualTo(3));
+			}
+		}
+
+		[Test]
+		public void ShouldNotFailWhenReplacingLevels()
+		{
+			using (var session = OpenSession())
+			{
+				var widget = new GridWidget
+					{
+						Levels =
+							{
+								new GridLevel(),
+								new GridLevel()
+							},
+					};
+
+				Save(session, widget);
+				Evict(session, widget);
+
+				widget.Levels.Clear();
+				widget.Levels.Add(new GridLevel());
+
+				Save(session, widget);
+				Evict(session, widget);
+
+				var loaded = session.Get<GridWidget>(widget.Id);
+
+				Assert.That(loaded.Levels.Count, Is.EqualTo(1));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" 
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH3234">
+
+  <class name="GridLevel" table="GridLevel" lazy="false">
+    <id name="Id" generator="guid" />
+  </class>
+
+  <class name="GridWidget" lazy="false">
+    <id name="Id" generator="guid" />
+    <bag name="Levels" schema="rm" table="GridLevel" lazy="false" cascade="all-delete-orphan">
+      <key column="WidgetId" not-null="true" />
+      <one-to-many class="GridLevel" />
+    </bag>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -700,6 +700,8 @@
     <Compile Include="NHSpecificTest\NH3050\Person.cs" />
     <Compile Include="NHSpecificTest\NH3050\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3050\FixtureByCode.cs" />
+    <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3234\Domain.cs" />
     <Compile Include="NHSpecificTest\Futures\LinqToFutureValueFixture.cs" />
     <Compile Include="NHSpecificTest\NH3332\Culture.cs" />
     <Compile Include="NHSpecificTest\NH3332\DataType.cs" />
@@ -2909,6 +2911,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH2860\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3332\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3050\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3234\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3057\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2651\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3121\Mappings.hbm.xml" />

src/NHibernate/Util/IdentityMap.cs

@@ -265,7 +265,7 @@ private object VerifyValidKey(object obj)
 		public static IDictionary Invert(IDictionary map)
 		{
 			IDictionary result = Instantiate(map.Count);
-			foreach (DictionaryEntry me in result)
+			foreach (DictionaryEntry me in map)
 			{
 				result[me.Value] = me.Key;
 			}