New tests.

[mono.git] / mcs / class / System.ServiceModel.Web / System.Runtime.Serialization.Json / DataContractJsonSerializer.cs

diff --git a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializer.cs b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializer.cs
index 36e3d997a6222f78a2a74dcf3f2e208ee579a1db..355ea31dadb87c57ef8a008949b9fc245fbf2cfe 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializer.cs
+++ b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializer.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Xml;
@@ -73,29 +74,24 @@ namespace System.Runtime.Serialization.Json
                {
                }
 
-        DataContractJsonSerializer(Type type, string rootName, IEnumerable<Type> knownTypes, int maxItemsInObjectGraph, bool ignoreExtensionDataObject, bool alwaysEmitTypeInformation)
-        {
-            if (type == null)
+               DataContractJsonSerializer(Type type, string rootName, IEnumerable<Type> knownTypes, int maxItemsInObjectGraph, bool ignoreExtensionDataObject, bool alwaysEmitTypeInformation)
+               {
+                       if (type == null)
                                throw new ArgumentNullException ("type");
                        if (rootName == null)
                                throw new ArgumentNullException ("rootName");
                        if (maxItemsInObjectGraph < 0)
                                throw new ArgumentOutOfRangeException ("maxItemsInObjectGraph");
 
-                       List<Type> types = new List<Type> ();
-                       types.Add (type);
-                       if (knownTypes != null)
-                               types.AddRange (knownTypes);
-
                        this.type = type;
-                       known_types = new ReadOnlyCollection<Type> (types);
+                       known_types = new ReadOnlyCollection<Type> (knownTypes != null ? knownTypes.ToArray () : Type.EmptyTypes);
                        root = rootName;
                        max_items = maxItemsInObjectGraph;
                        ignore_extension = ignoreExtensionDataObject;
                        always_emit_type = alwaysEmitTypeInformation;
                }
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                public DataContractJsonSerializer (Type type, IEnumerable<Type> knownTypes, int maxItemsInObjectGraph, bool ignoreExtensionDataObject, IDataContractSurrogate dataContractSurrogate, bool alwaysEmitTypeInformation)
             : this (type, default_root_name, knownTypes, maxItemsInObjectGraph, ignoreExtensionDataObject, alwaysEmitTypeInformation)
                {
@@ -121,7 +117,7 @@ namespace System.Runtime.Serialization.Json
                int max_items;
                bool ignore_extension;
                bool always_emit_type;
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
                IDataContractSurrogate surrogate;
 
                [MonoTODO]
@@ -160,7 +156,9 @@ namespace System.Runtime.Serialization.Json
                public override object ReadObject (Stream stream)
                {
 #if NET_2_1
-                       return ReadObject(JsonReaderWriterFactory.CreateJsonReader(stream, XmlDictionaryReaderQuotas.Max));
+                       var r = (JsonReader) JsonReaderWriterFactory.CreateJsonReader(stream, XmlDictionaryReaderQuotas.Max);
+                       r.LameSilverlightLiteralParser = true;
+                       return ReadObject(r);
 #else
                        return ReadObject (JsonReaderWriterFactory.CreateJsonReader (stream, new XmlDictionaryReaderQuotas ()));
 #endif