Merge pull request #820 from brendanzagaeski/master

[mono.git] / mcs / class / System.Net.Http / System.Net.Http.Headers / MediaTypeHeaderValue.cs

diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeHeaderValue.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeHeaderValue.cs
index 400467c763fa7c074376d3d0fcb12a1ece718abf..296010aa2ad5687ccc1487e963398122c412ec58 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeHeaderValue.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeHeaderValue.cs
@@ -33,7 +33,7 @@ namespace System.Net.Http.Headers
        public class MediaTypeHeaderValue : ICloneable
        {
                internal List<NameValueHeaderValue> parameters;
-               string media_type;
+               internal string media_type;
 
                public MediaTypeHeaderValue (string mediaType)
                {
@@ -61,7 +61,7 @@ namespace System.Net.Http.Headers
                                if (parameters == null)
                                        return null;
 
-                               var found = parameters.Find (l => StringComparer.OrdinalIgnoreCase.Equals (l.Name, "charset"));
+                               var found = parameters.Find (l => string.Equals (l.Name, "charset", StringComparison.OrdinalIgnoreCase));
                                if (found == null)
                                        return null;
 
@@ -72,17 +72,7 @@ namespace System.Net.Http.Headers
                                if (parameters == null)
                                        parameters = new List<NameValueHeaderValue> ();
 
-                               var found = parameters.Find (l => StringComparer.OrdinalIgnoreCase.Equals (l.Name, "charset"));
-                               if (string.IsNullOrEmpty (value)) {
-                                       if (found != null)
-                                               parameters.Remove (found);
-                               } else {
-                                       if (found != null) {
-                                               found.Value = value;
-                                       } else {
-                                               parameters.Add (new NameValueHeaderValue ("charset", value));
-                                       }
-                               }
+                               parameters.SetValue ("charset", value);
                        }
                }
 
@@ -95,7 +85,8 @@ namespace System.Net.Http.Headers
                                        throw new ArgumentNullException ("MediaType");
 
                                string temp;
-                               if (TryParseMediaType (new Lexer (value), out temp) != Token.Type.End)
+                               var token = TryParseMediaType (new Lexer (value), out temp);
+                               if (token == null || token.Value.Kind != Token.Type.End)
                                        throw new FormatException ();
 
                                media_type = temp;
@@ -159,7 +150,8 @@ namespace System.Net.Http.Headers
 
                        switch (token.Value.Kind) {
                        case Token.Type.SeparatorSemicolon:
-                               if (!NameValueHeaderValue.ParseParameters (lexer, out parameters))
+                               Token t;
+                               if (!NameValueHeaderValue.TryParseParameters (lexer, out parameters, out t) || t != Token.Type.End)
                                        return false;
                                break;
                        case Token.Type.End:
@@ -176,37 +168,7 @@ namespace System.Net.Http.Headers
                        return true;
                }
 
-               internal static bool TryParse<T> (string input, out T parsedValue, Func<T> factory) where T : MediaTypeHeaderValue
-               {
-                       parsedValue = null;
-
-                       var lexer = new Lexer (input);
-
-                       string media;
-                       List<NameValueHeaderValue> parameters = null;
-                       var token = TryParseMediaType (lexer, out media);
-                       if (token == null)
-                               return false;
-
-                       switch (token.Value.Kind) {
-                       case Token.Type.SeparatorSemicolon:
-                               if (!NameValueHeaderValue.ParseParameters (lexer, out parameters))
-                                       return false;
-                               break;
-                       case Token.Type.End:
-                               break;
-                       default:
-                               return false;
-                       }
-
-                       parsedValue = factory ();
-                       parsedValue.media_type = media;
-                       parsedValue.parameters = parameters;
-
-                       return true;
-               }
-
-               static Token? TryParseMediaType (Lexer lexer, out string media)
+               internal static Token? TryParseMediaType (Lexer lexer, out string media)
                {
                        media = null;