revert 144379

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

diff --git a/mcs/class/System.Json/System.Json/ChangeLog b/mcs/class/System.Json/System.Json/ChangeLog
index c6eb5a2dee7c314730c0a8895dc342f61622801a..8e9a6896c53eee69cc7c9e248d640f2ba4e3d649 100644 (file)
--- a/mcs/class/System.Json/System.Json/ChangeLog
+++ b/mcs/class/System.Json/System.Json/ChangeLog
@@ -1,7 +1,3 @@
-2009-10-19  Jb Evain  <jbevain@novell.com>
-
-       * JsonObject.cs, JsonArray.cs: backport r142424 and r143432.
-
 2009-10-05  Atsushi Enomoto  <atsushi@ximian.com>
 
        * JsonReader.cs : \uXXXX parser was totally wrong, giving wrong #.

diff --git a/mcs/class/System.Json/System.Json/JsonArray.cs b/mcs/class/System.Json/System.Json/JsonArray.cs
index 92e9bfd6d0e986b922091c4eccc4ef1df2fa96e2..a68877cab67335a2ee8264f93c62566e43f6ee77 100644 (file)
--- a/mcs/class/System.Json/System.Json/JsonArray.cs
+++ b/mcs/class/System.Json/System.Json/JsonArray.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -81,7 +80,7 @@ namespace System.Json
                        if (list != null)
                                list.AddRange (items);
                        else
-                               source = source.Concat (items);
+                               source = new MergedEnumerable<JsonValue> (source, items);
                }
 
                public void AddRange (JsonValue [] items)

diff --git a/mcs/class/System.Json/System.Json/JsonObject.cs b/mcs/class/System.Json/System.Json/JsonObject.cs
index 2cd6d0f6c5b88a64110fa1fb2b82ecad916432f3..128c7fba6c1de71e835d4aec441cfb5e9ef22159 100644 (file)
--- a/mcs/class/System.Json/System.Json/JsonObject.cs
+++ b/mcs/class/System.Json/System.Json/JsonObject.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -113,7 +112,7 @@ namespace System.Json
                {
                        if (items == null)
                                throw new ArgumentNullException ("items");
-                       source = source.Concat (items);
+                       source = new MergedEnumerable<JsonPair> (source, items);
                        map = null;
                }