Added requested null checks.

FrancisChung · Jun 13, 2019 · 7373bc9 · 7373bc9
1 parent 1dd7123
commit 7373bc9
Showing 1 changed file with 105 additions and 0 deletions.
diff --git a/source/Cosmos.Core_Plugs/System/Collections/Generic/ComparerHelpersImpl.cs b/source/Cosmos.Core_Plugs/System/Collections/Generic/ComparerHelpersImpl.cs
@@ -321,6 +321,16 @@ public override int Compare(Char? x, Char? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -342,6 +352,16 @@ public override int Compare(Byte? x, Byte? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -363,6 +383,16 @@ public override int Compare(SByte? x, SByte? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -384,6 +414,16 @@ public override int Compare(Int16? x, Int16? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -405,6 +445,16 @@ public override int Compare(UInt16? x, UInt16? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -426,6 +476,16 @@ public override int Compare(Int32? x, Int32? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -447,6 +507,16 @@ public override int Compare(UInt32? x, UInt32? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -468,6 +538,16 @@ public override int Compare(Int64? x, Int64? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -489,6 +569,16 @@ public override int Compare(UInt64? x, UInt64? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -510,6 +600,16 @@ public override int Compare(Guid? x, Guid? y)
                 return x.Value.CompareTo(y.Value);
             }
 
+            if (!x.HasValue)
+            {
+                return -1;
+            }
+
+            if (!y.HasValue)
+            {
+                return 1;
+            }
+
             return 0;
         }
     }
@@ -518,6 +618,11 @@ public class ObjectComparer : Comparer<Object>
     {
         public override int Compare(Object x, Object y)
         {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+
             string text = x as string;
             string text2 = y as string;
             if (text != null && text2 != null)