svn commit: r1299947 - /commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java

[se...@apache.org]

Author: sebb
Date: Tue Mar 13 01:45:57 2012
New Revision: 1299947

URL: http://svn.apache.org/viewvc?rev=1299947&view=rev
Log:
Use fixed Locale for upcasing

Modified:
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java?rev=1299947&r1=1299946&r2=1299947&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java Tue Mar 13 01:45:57 2012
@@ -29,6 +29,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.MessageFormat;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -628,7 +629,7 @@ public class XmlStreamReader extends Rea
      * httpContentType is NULL.
      *
      * @param httpContentType the HTTP content type
-     * @return The content type encoding
+     * @return The content type encoding (upcased)
      */
     static String getContentTypeEncoding(String httpContentType) {
         String encoding = null;
@@ -638,7 +639,7 @@ public class XmlStreamReader extends Rea
                 String postMime = httpContentType.substring(i + 1);
                 Matcher m = CHARSET_PATTERN.matcher(postMime);
                 encoding = (m.find()) ? m.group(1) : null;
-                encoding = (encoding != null) ? encoding.toUpperCase() : null;
+                encoding = (encoding != null) ? encoding.toUpperCase(Locale.US) : null;
             }
         }
         return encoding;