2010-02-24 Atsushi Enomoto <atsushi@ximian.com>

	* JsonWriter.cs : write NaN, INF, -INF as JSON string, not JSON number.
	  Fixed bug #573691.

svn path=/trunk/mcs/; revision=152342

diff --git a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/ChangeLog b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/ChangeLog
index a3f7b28e0a998780d06de1e19ce455db73a1ad2f..8a918994b3e080156dd12448de1f47051a4097f2 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/ChangeLog
+++ b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-24  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * JsonWriter.cs : write NaN, INF, -INF as JSON string, not JSON number.
+         Fixed bug #573691.
+
 2010-01-27  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataContractJsonSerializer.cs : KnownTypes does not include root

diff --git a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonWriter.cs b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonWriter.cs
index 64c85121f7e4967dd723c72e693d87848f0536f6..31ceaa27ce46ba8e933e63192b75d7918581c358 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonWriter.cs
+++ b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonWriter.cs
@@ -364,6 +364,21 @@ namespace System.Runtime.Serialization.Json
                                        }
                                        break;
                                case ElementType.Number:
+                                       // .NET is buggy here, it just outputs raw string, which results in invalid JSON format.
+                                       bool isString = false;
+                                       switch (text) {
+                                       case "INF":
+                                       case "-INF":
+                                       case "NaN":
+                                               isString = true;
+                                               break;
+                                       }
+                                       if (isString) {
+                                               element_kinds.Pop ();
+                                               element_kinds.Push (ElementType.String);
+                                               goto case ElementType.String;
+                                       }
+                                       break;
                                case ElementType.Boolean:
                                        break;
                                default: