Revert incorrect changes from commit 950d9c8a567273c3363f43cee454f2b95a9f5da7

Correctly handle null value deserialization in non-generic Deserialize(string, Type) method.

2 files changed, 3 insertions, 4 deletions

diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
index 6a147e2e03e..9095cb866d3 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
@@ -206,8 +206,7 @@ namespace System.Web.Script.Serialization
 		public object Deserialize (string input, Type targetType) {
 			object obj = DeserializeObjectInternal (input);
 
-			if (obj == null)
-				return Activator.CreateInstance (targetType);
+			if (obj == null) return null;
 
 			return ConvertToType (obj, targetType);
 		}
diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
index 8593e532bf0..46bef52a7b4 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
@@ -833,7 +833,7 @@ namespace System.Web.Script.Serialization
 
 		void CreateArray ()
 		{
-			var arr = new List <object> ();
+			var arr = new ArrayList ();
 			PushObject (arr);
 		}
 		
@@ -865,7 +865,7 @@ namespace System.Web.Script.Serialization
 		{
 			Dictionary <string, object> dict = PeekObject () as Dictionary <string, object>;
 			if (dict == null) {
-				List <object> arr = PeekObject () as List <object>;
+				ArrayList arr = PeekObject () as ArrayList;
 				if (arr == null)
 					throw new InvalidOperationException ("Internal error: current object is not a dictionary or an array.");
 				arr.Add (o);