Test and fix for NH-3141

src/NHibernate.Test/NHSpecificTest/NH3141/Entity.cs

@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.NH3141
+{
+	public class Entity
+	{
+		public virtual int Id { get; set; }
+	}
+}

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.NHSpecificTest.NH3141">
+	<class name="Entity">
+		<id name="Id" type="int">
+			<generator class="native"/>
+		</id>
+	</class>
+</hibernate-mapping>
+

src/NHibernate.Test/NHSpecificTest/NH3141/ProxyIdPerformanceTest.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Diagnostics;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3141
+{
+	[TestFixture]
+	public class ProxyIdPerformanceTest : BugTestCase
+	{
+		private int id;
+
+		protected override void OnSetUp()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				id = (int) s.Save(new Entity());
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Entity e").ExecuteUpdate();
+				tx.Commit();
+			}
+		}
+
+		[Test, Explicit("No logical test - just to compare before/after fix")]
+		public void ShouldUseIdDirectlyFromProxy()
+		{
+			var proxyEntity = CreateInitializedProxy();
+
+			const int loop = 1000000;
+			var watch = new Stopwatch();
+			watch.Start();
+			const int dummyValue = 0;
+			for (var i = 0; i < loop; i++)
+			{
+				dummyValue.CompareTo(proxyEntity.Id);
+			}
+			watch.Stop();
+
+			//before fix: 2.2s
+			//after fix: 0.8s
+			Console.WriteLine(watch.Elapsed);
+		}
+
+		private Entity CreateInitializedProxy()
+		{
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var proxyEntity = s.Load<Entity>(id);
+				NHibernateUtil.Initialize(proxyEntity);
+				return proxyEntity;
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1097,6 +1097,8 @@
     <Compile Include="MappingByCode\IntegrationTests\NH3105\Model.cs" />
     <Compile Include="MappingByCode\IntegrationTests\NH3105\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3436\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3141\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3141\ProxyIdPerformanceTest.cs" />
     <Compile Include="NHSpecificTest\NH941\Domain.cs" />
     <Compile Include="NHSpecificTest\NH941\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH941\FixtureUsingList.cs" />
@@ -3014,6 +3016,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3132\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3139\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2812\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3141\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2664\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2214\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2960\Mappings.hbm.xml" />

src/NHibernate/Proxy/Poco/BasicLazyInitializer.cs

@@ -73,7 +73,7 @@ public virtual object Invoke(MethodInfo method, object[] args, object proxy)
 				{
 					return IdentityEqualityComparer.GetHashCode(proxy);
 				}
-				else if (IsUninitialized && IsEqualToIdentifierMethod(method))
+				else if (IsEqualToIdentifierMethod(method))
 				{
 					return Identifier;
 				}