# HG changeset patch # User Jaroslav Tulach # Date 1424974799 -3600 # Node ID 7b3c3c327cf064adf7c180169a3e30285a723126 # Parent 1f9e7b051e422f1c5adb6044694e6d5c5f3ccaa0 More defensive parsing of locale. It can have just the country segment. diff -r 1f9e7b051e42 -r 7b3c3c327cf0 rt/emul/compact/src/main/java/java/util/Locale.java --- a/rt/emul/compact/src/main/java/java/util/Locale.java Thu Feb 26 16:08:21 2015 +0100 +++ b/rt/emul/compact/src/main/java/java/util/Locale.java Thu Feb 26 19:19:59 2015 +0100 @@ -638,7 +638,7 @@ String lang = language(); if (lang != null) { String[] arr = lang.split("-"); - return new Locale(arr[0], arr[1]); + return new Locale(arr[0], arr.length == 1 ? "" : arr[1]); } return Locale.US; }