Backport of r96841

svn path=/branches/mono-1-9/mcs/; revision=96842
baulig · Feb 28, 2008 · 503db17 · 503db17
1 parent fc080ff
commit 503db17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
@@ -2,7 +2,8 @@
 
 	* HttpParamsCollection.cs: restore the GetValues overrides only to
 	make sure the collections are merged before invoking the base
-	implementation.
+	implementation. 
+	Remove code that's no longer needed.
 
 2008-02-25  Marek Habersack  <mhabersack@novell.com>
 

diff --git a/mcs/class/System.Web/System.Web/HttpParamsCollection.cs b/mcs/class/System.Web/System.Web/HttpParamsCollection.cs
@@ -55,35 +55,8 @@ internal class HttpParamsCollection : WebROCollection
 
 		public override string Get (string name)
 		{
-			if (_merged)
-				return base.Get (name);
-
-			string values = null;
-
-			string query_value = _queryString [name];
-			if (query_value != null)
-				values += query_value;
-
-			string form_value = _form [name];
-			if (form_value != null)
-				values += "," + form_value;
-
-			string servar_value = _serverVariables [name];
-			if (servar_value != null)
-				values += "," + servar_value;
-
-			HttpCookie answer = _cookies [name];
-			string cookie_value = ((answer == null) ? null : answer.Value);
-			if (cookie_value != null)
-				values += "," + cookie_value;
-
-			if (values == null)
-				return null;
-
-			if (values.Length > 0 && values [0] == ',')
-				return values.Substring (1);
-
-			return values;
+			MergeCollections ();
+			return base.Get (name);
 		}
 
 		private void MergeCollections ()