commit 360bc5c1b420f1c9ed7d0525e79c784f79f30e91
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 10 20:53:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 20:53:24 2017 +0000
tree d459cf49c3e7ff1d0696853e000674e07d5ea199
parent 4b2c09e06e61fccf48908b594f22ee14d2a31fee
parent 242478c8a84d2fc9fd2e47f2b143622f1c9405db

Merge "Fix error index of unparsed timezone name."

luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java

diff --git a/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java b/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
index b95f9fe..20fa986 100644
--- a/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
+++ b/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
@@ -557,4 +557,30 @@
         dateFormat.setTimeZone(UTC);
         assertEquals("UTC", dateFormat.format(new Date(0)));
     }
+
+    // http://b/35134326
+    public void testTimeZoneParsingErrorIndex() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy z", Locale.ENGLISH);
+
+        checkTimeZoneParsingErrorIndex(dateFormat);
+    }
+
+    // http://b/35134326
+    public void testTimeZoneParsingErrorIndexWithZoneStrings() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy z", Locale.ENGLISH);
+        // Force legacy code path by using zone strings.
+        DateFormatSymbols dfs = dateFormat.getDateFormatSymbols();
+        dfs.setZoneStrings(dfs.getZoneStrings());
+        dateFormat.setDateFormatSymbols(dfs);
+
+        checkTimeZoneParsingErrorIndex(dateFormat);
+    }
+
+    private void checkTimeZoneParsingErrorIndex(SimpleDateFormat dateFormat) {
+        ParsePosition pos = new ParsePosition(0);
+        Date parsed;
+        parsed = dateFormat.parse("2000 foobar", pos);
+        assertNull(parsed);
+        assertEquals("Wrong error index", 5, pos.getErrorIndex());
+    }
 }

ojluni/src/main/java/java/text/SimpleDateFormat.java

diff --git a/ojluni/src/main/java/java/text/SimpleDateFormat.java b/ojluni/src/main/java/java/text/SimpleDateFormat.java
index de2a93e..700d5ca 100644
--- a/ojluni/src/main/java/java/text/SimpleDateFormat.java
+++ b/ojluni/src/main/java/java/text/SimpleDateFormat.java
@@ -1821,7 +1821,7 @@
             }
             if (bestMatch == null) {
                 // No match found, return error.
-                return 0;
+                return -start;
             }
         }
 
@@ -1926,7 +1926,7 @@
             }
             return (start + zoneNames[nameIndex].length());
         }
-        return 0;
+        return -start;
     }
 
     /**