Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 03:15:32 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #317 from johnjaylward/fixLocale

Browse Source 
make sure locale independent data is not upper/lowercased incorrectly…
This commit is contained in:
Sean Leary 2017-02-19 21:34:17 -06:00 committed by GitHub
commit 724fb888f7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HTTP.java
View File

@ -25,6 +25,7 @@ SOFTWARE.
*/
import java.util.Iterator;
import java.util.Locale;
/**
* Convert an HTTP header to a JSONObject and back.
@ -74,7 +75,7 @@ public class HTTP {
String token;
token = x.nextToken();
if (token.toUpperCase().startsWith("HTTP")) {
if (token.toUpperCase(Locale.ROOT).startsWith("HTTP")) {
// Response

4
JSONObject.java
View File

@ -1157,9 +1157,9 @@ public class JSONObject {
&& 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);
}