Merge pull request #2034 from alexrp/ctx-cleanup

[mono.git] / mcs / class / System.Runtime.Serialization / ReferenceSources / JsonFormatWriterGenerator_static.cs

diff --git a/mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatWriterGenerator_static.cs b/mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatWriterGenerator_static.cs
index 1e595b7940a23baace07d77963904aa6f2933eae..90f038bccd281dfc74c7595cd4f4e66e3c602fd8 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatWriterGenerator_static.cs
+++ b/mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatWriterGenerator_static.cs
@@ -381,7 +381,8 @@ namespace System.Runtime.Serialization.Json
 
                internal bool IsDefaultValue (Type type, object value)
                {
-                       return GetDefaultValue (type).Equals (value);
+                       var def = GetDefaultValue (type);
+                       return def == null ? (object) value == null : def.Equals (value);
                }
 
                internal object GetDefaultValue(Type type)