Obsolete EqualsHelper

Author: hazzik

src/NHibernate.DomainModel/Async/CustomPersister.cs

@@ -37,7 +37,7 @@ public Task<int[]> FindDirtyAsync(object[] currentState, object[] previousState,
 		{
 			try
 			{
-				if (!EqualsHelper.Equals(currentState[0], previousState[0]))
+				if (!Equals(currentState[0], previousState[0]))
 				{
 					return Task.FromResult<int[]>(new int[] { 0 });
 				}
@@ -56,7 +56,7 @@ public Task<int[]> FindModifiedAsync(object[] old, object[] current, object enti
 		{
 			try
 			{
-				if (!EqualsHelper.Equals(old[0], current[0]))
+				if (!Equals(old[0], current[0]))
 				{
 					return Task.FromResult<int[]>(new int[] { 0 });
 				}

src/NHibernate.DomainModel/CustomPersister.cs

@@ -254,7 +254,7 @@ public IType GetPropertyType(string propertyName)
 
 		public int[] FindDirty(object[] currentState, object[] previousState, object entity, ISessionImplementor session)
 		{
-			if (!EqualsHelper.Equals(currentState[0], previousState[0]))
+			if (!Equals(currentState[0], previousState[0]))
 			{
 				return new int[] { 0 };
 			}
@@ -266,7 +266,7 @@ public int[] FindDirty(object[] currentState, object[] previousState, object ent
 
 		public int[] FindModified(object[] old, object[] current, object entity, ISessionImplementor session)
 		{
-			if (!EqualsHelper.Equals(old[0], current[0]))
+			if (!Equals(old[0], current[0]))
 			{
 				return new int[] { 0 };
 			}

src/NHibernate/Type/AbstractType.cs

@@ -208,7 +208,7 @@ public virtual bool IsSame(object x, object y)
 
 		public virtual bool IsEqual(object x, object y)
 		{
-			return EqualsHelper.Equals(x, y);
+			return Equals(x, y);
 		}
 
 		public virtual bool IsEqual(object x, object y, ISessionFactoryImplementor factory)

src/NHibernate/Type/NullableType.cs

@@ -332,7 +332,7 @@ public override bool[] ToColumnNullness(object value, IMapping mapping)
 
 		public override bool IsEqual(object x, object y)
 		{
-			return EqualsHelper.Equals(x, y);
+			return Equals(x, y);
 		}
 
 		#region override of System.Object Members

src/NHibernate/Util/EqualsHelper.cs

@@ -1,10 +1,13 @@
+using System;
+
 namespace NHibernate.Util
 {
 	public static class EqualsHelper
 	{
+		[Obsolete("Please use object.Equals(object, object) instead.")]
 		public new static bool Equals(object x, object y)
 		{
-			return x == y || (x != null && y != null && x.Equals(y));
+			return object.Equals(x, y);
 		}
 	}
 }