Add support for deserializing Char types

* JsonSerializationReader.cs: Add Char type to the switch. Reads the
  content as a string and validates its length

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 521c4980549cb958070065a65c3fff0c61bd5267..e0d70bd8051484c7159183a36fbcd36865a8a590 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-07-27  Andreia Gaita  <avidigal@novell.com>
+
+       * JsonSerializationReader.cs: Add Char type to the switch. Reads the
+         content as a string and validates its length
+
 2010-07-27  Andreia Gaita  <avidigal@novell.com>
 
        * JsonSerializationReader.cs, JsonSerializationWriter.cs:

diff --git a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs
index c921a49780c5616acd1baec982d80241a2ecfc18..833f223828090ef49ae301eec9f05882b2e3b35a 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs
+++ b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationReader.cs
@@ -86,6 +86,11 @@ namespace System.Runtime.Serialization.Json
                                }
                                else
                                        return reader.ReadElementContentAsString ();
+                       case TypeCode.Char:
+                               var c = reader.ReadElementContentAsString ();
+                               if (c.Length > 1)
+                                       throw new XmlException ("Invalid JSON char");
+                               return Char.Parse(c);
                        case TypeCode.Single:
                                return reader.ReadElementContentAsFloat ();
                        case TypeCode.Double: