Merge pull request #317 from johnjaylward/fixLocale

make sure locale independent data is not upper/lowercased incorrectly…
stleary · Feb 20, 2017 · 724fb88 · 724fb88
2 parents 5ff8b4c + eb806f4
commit 724fb88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/HTTP.java b/HTTP.java
@@ -25,6 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
 */
 
 import java.util.Iterator;
+import java.util.Locale;
 
 /**
  * Convert an HTTP header to a JSONObject and back.
@@ -74,7 +75,7 @@ public static JSONObject toJSONObject(String string) throws JSONException {
         String         token;
 
         token = x.nextToken();
-        if (token.toUpperCase().startsWith("HTTP")) {
+        if (token.toUpperCase(Locale.ROOT).startsWith("HTTP")) {
 
 // Response
 

diff --git a/JSONObject.java b/JSONObject.java
@@ -1157,9 +1157,9 @@ private void populateMap(Object bean) {
                             && Character.isUpperCase(key.charAt(0))
                             && method.getParameterTypes().length == 0) {
                         if (key.length() == 1) {
-                            key = key.toLowerCase();
+                            key = key.toLowerCase(Locale.ROOT);
                         } else if (!Character.isUpperCase(key.charAt(1))) {
-                            key = key.substring(0, 1).toLowerCase()
+                            key = key.substring(0, 1).toLowerCase(Locale.ROOT)
                                     + key.substring(1);
                         }