Switched order of null check to be before Equals because Mono does

Mike Doerfler · Mike Doerfler · commit 82f3dc876174 · 2004-09-10T12:21:21.000Z
not like have a null object passed into Equals.


SVN: trunk@949
diff --git a/src/NHibernate/Persister/AbstractEntityPersister.cs b/src/NHibernate/Persister/AbstractEntityPersister.cs
@@ -654,7 +654,8 @@ protected AbstractEntityPersister(PersistentClass model, ISessionFactoryImplemen
 			pis.Add(typeof(HibernateProxy));
 			//pis.Add( typeof(INHibernateProxy) );
 			// != null because we use arraylist instead of hashset
-			if (!mappedClass.Equals(pi) && pi!=null ) 
+			// mono does not like a null value passed into Equals()
+			if ( pi!=null && !mappedClass.Equals(pi) ) 
 			{
 				pis.Add(pi); 
 			}

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,8 @@ protected AbstractEntityPersister(PersistentClass model, ISessionFactoryImplemen`
`654`	`654`	`pis.Add(typeof(HibernateProxy));`
`655`	`655`	`//pis.Add( typeof(INHibernateProxy) );`
`656`	`656`	`// != null because we use arraylist instead of hashset`
`657`		`- if (!mappedClass.Equals(pi) && pi!=null )`
	`657`	`+ // mono does not like a null value passed into Equals()`
	`658`	`+ if ( pi!=null && !mappedClass.Equals(pi) )`
`658`	`659`	`{`
`659`	`660`	`pis.Add(pi);`
`660`	`661`	`}`