SF.net SVN: orm:[1554] trunk/ORMModel/ObjectModel/ORMCore. ElementEquivalence.cs

[<mcu...@us...>]

Revision: 1554
          http://sourceforge.net/p/orm/code/1554
Author:   mcurland
Date:     2014-12-19 07:20:36 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
Fixed cross-model drag silent crash for unary fact types on objectifications with different fact type signatures but same name. Missing a null check in this case.

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/ORMCore.ElementEquivalence.cs

Modified: trunk/ORMModel/ObjectModel/ORMCore.ElementEquivalence.cs
===================================================================
--- trunk/ORMModel/ObjectModel/ORMCore.ElementEquivalence.cs	2014-12-02 22:16:48 UTC (rev 1553)
+++ trunk/ORMModel/ObjectModel/ORMCore.ElementEquivalence.cs	2014-12-19 07:20:36 UTC (rev 1554)
@@ -202,7 +202,7 @@
 								otherObjectType = null;
 							}
 						}
-						if (otherObjectType.IsValueType != isValueType) 
+						if (otherObjectType != null && otherObjectType.IsValueType != isValueType) 
 						{
 							otherObjectType = null;
 						}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.