From abad9120d8df6b484af14089c18e5d97dcf69bae Mon Sep 17 00:00:00 2001
From: jbevain <jbevain@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Mon, 19 Oct 2009 14:26:55 +0000
Subject: [PATCH] 2009-10-19  Jb Evain  <jbevain@novell.com>

	* JsonObject.cs, JsonArray.cs: backport r142424 and r143432.



git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@144379 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 class/System.Json/System.Json/ChangeLog     | 4 ++++
 class/System.Json/System.Json/JsonArray.cs  | 3 ++-
 class/System.Json/System.Json/JsonObject.cs | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/class/System.Json/System.Json/ChangeLog b/class/System.Json/System.Json/ChangeLog
index 8e9a6896c5..c6eb5a2dee 100644
--- a/class/System.Json/System.Json/ChangeLog
+++ b/class/System.Json/System.Json/ChangeLog
@@ -1,3 +1,7 @@
+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/class/System.Json/System.Json/JsonArray.cs b/class/System.Json/System.Json/JsonArray.cs
index a68877cab6..92e9bfd6d0 100644
--- a/class/System.Json/System.Json/JsonArray.cs
+++ b/class/System.Json/System.Json/JsonArray.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -80,7 +81,7 @@ namespace System.Json
 			if (list != null)
 				list.AddRange (items);
 			else
-				source = new MergedEnumerable<JsonValue> (source, items);
+				source = source.Concat (items);
 		}
 
 		public void AddRange (JsonValue [] items)
diff --git a/class/System.Json/System.Json/JsonObject.cs b/class/System.Json/System.Json/JsonObject.cs
index 128c7fba6c..2cd6d0f6c5 100644
--- a/class/System.Json/System.Json/JsonObject.cs
+++ b/class/System.Json/System.Json/JsonObject.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -112,7 +113,7 @@ namespace System.Json
 		{
 			if (items == null)
 				throw new ArgumentNullException ("items");
-			source = new MergedEnumerable<JsonPair> (source, items);
+			source = source.Concat (items);
 			map = null;
 		}
 
-- 
2.11.4.GIT