Merge faster time-zone parsing

Fixes #282
JodaOrg · Aug 20, 2015 · 695c02c · 695c02c
1 parent 027bfdd
commit 695c02c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@ This is the same license as all of Apache, plus other open source projects such
 
 Changes in 2.8.3
 ================
+- Faster parsing of time-zone identifiers [#282]
 
 
 Changes in 2.8.2

diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,10 @@
       <name>Luc Claes</name>
       <url>https://github.com/lucclaes</url>
     </contributor>
+    <contributor>
+      <name>Emiliano Claria</name>
+      <url>https://github.com/emilianogc</url>
+    </contributor>
     <contributor>
       <name>Dan Cojocar</name>
       <url>https://github.com/dancojocar</url>

diff --git a/src/main/java/org/joda/time/format/DateTimeFormatterBuilder.java b/src/main/java/org/joda/time/format/DateTimeFormatterBuilder.java
@@ -2313,7 +2313,7 @@ static enum TimeZoneId
             implements InternalPrinter, InternalParser {
 
         INSTANCE;
-        static final List<String> ALL_IDS;
+        private static final List<String> ALL_IDS;
         static {
             ALL_IDS = new ArrayList<String>(DateTimeZone.getAvailableIDs());
             Collections.sort(ALL_IDS);
@@ -2354,7 +2354,9 @@ public int parseInto(DateTimeParserBucket bucket, CharSequence text, int positio
                     if (best == null || id.length() > best.length()) {
                         best = id;
                     }
-                } else break;
+                } else {
+                    break;
+                }
             }
             if (best != null) {
                 bucket.setZone(DateTimeZone.forID(best));
@@ -2370,7 +2372,7 @@ private static int prefixedStartPosition(CharSequence text, int position) {
             while (lo <= hi) {
                 int mid = (lo + hi) >>> 1;
                 String value = ALL_IDS.get(mid);
-                int compare = csCompare(value, text, position);
+                int compare = csCompare(text, position, value);
                 if (compare > 0) {
                     hi = mid - 1;
                 } else if (compare < 0) {
@@ -2614,11 +2616,13 @@ public int parseInto(DateTimeParserBucket bucket, CharSequence text, int positio
         }
     }
 
-    static int csCompare(String search, CharSequence text, int position) {
+    static int csCompare(CharSequence text, int position, String search) {
         int compareLen = Math.min(text.length() - position, search.length());
         for (int i = 0; i < compareLen; i++) {
             int result = search.charAt(i) - text.charAt(position + i);
-            if (result != 0) return result;
+            if (result != 0) {
+                return result;
+            }
         }
         return 0;
     }