Fix NH-1584 by Seth Schubert

SVN: trunk@4006

Author: fabiomaulo

src/NHibernate.Test/NHSpecificTest/NH1584/TestFixture.cs

@@ -6,14 +6,9 @@
 
 namespace NHibernate.Test.NHSpecificTest.NH1584
 {
-	[TestFixture, Ignore("Not supported yet.")]
+	[TestFixture]
 	public class TestFixture : BugTestCase
 	{
-		public override string BugNumber
-		{
-			get { return "NH1584"; }
-		}
-
 		protected override void OnTearDown()
 		{
 			using (ISession session = OpenSession())

src/NHibernate/Engine/AssociationKey.cs

@@ -12,25 +12,35 @@ internal sealed class AssociationKey
 	{
 		private readonly EntityKey ownerKey;
 		private readonly string propertyName;
+		private readonly int hashCode;
 
 		public AssociationKey(EntityKey ownerKey, string propertyName)
 		{
 			this.ownerKey = ownerKey;
 			this.propertyName = propertyName;
+			hashCode = ownerKey.GetHashCode() ^ propertyName.GetHashCode() ^ ownerKey.EntityName.GetHashCode();
 		}
 
 		public override bool Equals(object that)
 		{
-			if(this==that) return true;
+			// NH : Different behavior for NH-1584
+			if (this == that)
+			{
+				return true;
+			}
 
-			AssociationKey key = that as AssociationKey;
-			if(key==null) return false;
-			return key.propertyName.Equals(propertyName) && key.ownerKey.Equals(ownerKey);
+			var key = that as AssociationKey;
+			if (key == null)
+			{
+				return false;
+			}
+			return key.propertyName.Equals(propertyName) && key.ownerKey.Equals(ownerKey)
+			       && key.ownerKey.EntityName.Equals(ownerKey.EntityName);
 		}
 
 		public override int GetHashCode()
 		{
-			return ownerKey.GetHashCode() ^ propertyName.GetHashCode();
+			return hashCode;
 		}
 	}
-}
+}