in System.ServiceModel.Web/System.Runtime.Serialization.Json:

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

diff --git a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonReaderWriterFactory.cs b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonReaderWriterFactory.cs
index 08ca6586a734721bc49e8f867263a09e13997479..58084224c311b7be148485e2db7e88d41b0d5f6d 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonReaderWriterFactory.cs
+++ b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonReaderWriterFactory.cs
@@ -43,7 +43,7 @@ namespace System.Runtime.Serialization.Json
 
                public static XmlDictionaryReader CreateJsonReader (byte [] source, int offset, int length, XmlDictionaryReaderQuotas quotas)
                {
-                       return CreateJsonReader (source, offset, length, Detect (source), quotas, null);
+                       return CreateJsonReader (source, offset, length, null, quotas, null);
                }
 
                public static XmlDictionaryReader CreateJsonReader (byte [] source, int offset, int length, Encoding encoding, XmlDictionaryReaderQuotas quotas, OnXmlDictionaryReaderClose readerClose)
@@ -53,7 +53,7 @@ namespace System.Runtime.Serialization.Json
 
                public static XmlDictionaryReader CreateJsonReader (Stream source, XmlDictionaryReaderQuotas quotas)
                {
-                       return CreateJsonReader (source, Detect (source), quotas, null);
+                       return CreateJsonReader (source, null, quotas, null);
                }
 
                public static XmlDictionaryReader CreateJsonReader (Stream source, Encoding encoding, XmlDictionaryReaderQuotas quotas, OnXmlDictionaryReaderClose readerClose)
@@ -75,35 +75,5 @@ namespace System.Runtime.Serialization.Json
                {
                        return new JsonWriter (stream, encoding, closeOutput);
                }
-
-               static Encoding Detect (int b1, int b2)
-               {
-                       if (b1 != -1 && b2 != -1) {
-                               if (b1 != 0 && b2 == 0)
-                                       return new UnicodeEncoding (false, false, true);
-                               else if (b1 == 0 && b2 != 0)
-                                       return new UnicodeEncoding (true, false, true);
-                       }
-                       return new UTF8Encoding (false, true);
-               }
-
-               static Encoding Detect (Stream source)
-               {
-                       if (source == null)
-                               throw new ArgumentNullException ("source");
-                       Stream stream = source;
-                       if (!stream.CanSeek)
-                               stream = new BufferedStream (source);
-                       Encoding e = Detect (stream.ReadByte(), stream.ReadByte());
-                       stream.Position = 0;
-                       return e;
-               }
-
-               static Encoding Detect (byte[] bytes)
-               {
-                       if (bytes.Length < 2)
-                               return new UTF8Encoding (false, true);
-                       return Detect (bytes[0], bytes[1]);
-               }
        }
 }