Merge pull request #1309 from esdrubal/json

Improved Json deserialization of floating-point numbers.
mono · Sep 25, 2014 · 410af9c · 410af9c
2 parents 40ccf51 + 92a4fd2
commit 410af9c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...lass/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs b/...lass/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs
@@ -264,7 +264,7 @@ object ReadInstanceDrivenObject ()
 				if (double.TryParse (v, NumberStyles.None, CultureInfo.InvariantCulture, out dbl))
 					return dbl;
 				decimal dec;
-				if (decimal.TryParse (v, NumberStyles.None, CultureInfo.InvariantCulture, out dec))
+				if (decimal.TryParse (v, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out dec))
 					return dec;
 				throw SerializationError (String.Format ("Invalid JSON input: {0}", v));
 			default:

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/JsonReaderTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/JsonReaderTest.cs
@@ -855,5 +855,16 @@ public void UnicodeEncodingAutoDetect ()
 			r.ReadStartElement ();
 			r.Read ();
 		}
+
+		[Test]
+		public void ReadNumberAsObject ()
+		{
+			const double testValue = 42.42D;
+			var serializer = new DataContractJsonSerializer (typeof (object));
+			var serializedStream = GetInput (testValue.ToString (CultureInfo.InvariantCulture));
+			var deserializedValue = serializer.ReadObject (serializedStream);
+			Assert.AreEqual (typeof (decimal), deserializedValue.GetType ());
+			Assert.AreEqual (testValue, (decimal) deserializedValue);
+		}
 	}
 }