[S.R.Serialization] fix default value comparison.

The fixed code used to invoke null.Equals(other).

The new test (by @alien0ada) shows the failing case.

1 files changed, 56 insertions, 1 deletions

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
index bb7c1d9f579..bede256b8c9 100644
--- a/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
@@ -1894,6 +1894,32 @@ namespace MonoTests.System.Runtime.Serialization.Json
 
 		public class IntList : List<int>{}
 		#endregion
+
+		[Test]
+		public void DefaultValueDeserialization ()
+		{
+			// value type
+			var person = new Person { name = "John" };
+			using (var ms = new MemoryStream()) {
+				var serializer = new DataContractJsonSerializer (typeof (Person), new DataContractJsonSerializerSettings {
+					SerializeReadOnlyTypes = true,
+					UseSimpleDictionaryFormat = true
+					});
+				serializer.WriteObject (ms, person);
+			}
+
+			// reference type
+			var person2 = new PersonWithContact {
+				name = "Jane",
+				contact = new Contact { url = "localhost", email = "jane@localhost" } };
+			using (var ms = new MemoryStream ()) {
+				var serializer = new DataContractJsonSerializer (typeof (PersonWithContact), new DataContractJsonSerializerSettings {
+					SerializeReadOnlyTypes = true,
+					UseSimpleDictionaryFormat = true
+					});
+				serializer.WriteObject (ms, person2);
+			}
+		}
 	}
 	
 	public class CharTest
@@ -2685,4 +2711,33 @@ public class Bug13485Type
 		}
 	}	
 
-#endregion
\ No newline at end of file
+#endregion
+
+#region DefaultValueDeserialization
+    [DataContract]
+    public class Person
+    {
+        [DataMember(EmitDefaultValue = false)]
+        public string name { get; set; }
+    }
+
+    [DataContract]
+    public class PersonWithContact
+    {
+        [DataMember(EmitDefaultValue = false)]
+        public string name { get; set; }
+
+        [DataMember(EmitDefaultValue = false)]
+        public Contact contact { get; set; }
+    }
+
+    [DataContract]
+    public class Contact
+    {
+        [DataMember(EmitDefaultValue = false)]
+        public string url { get; set; }
+
+        [DataMember(EmitDefaultValue = false)]
+        public string email{ get; set; }
+    }
+#endregion