Apache/commons-lang
1
0
Fork 0
mirror of https://github.com/apache/commons-lang.git synced 2025-02-14 05:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

LANG-1285: NullPointerException in FastDateParser$TimeZoneStrategy (closes #212)

Browse Source 
Replicate the fix for LANG-1186
This commit is contained in:
Francesco Chicchiriccò 2016-11-16 07:07:43 +01:00 committed by pascalschumacher
parent fd80301b1e
commit c14890f08b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/lang3/time/FastDateParser.java
View File

@ -866,6 +866,7 @@ private static class TzInfo {
tzInfo = standard; tzInfo = standard;
break; break;
} }
if (zoneNames[i] != null) {
final String key = zoneNames[i].toLowerCase(locale); final String key = zoneNames[i].toLowerCase(locale);
// ignore the data associated with duplicates supplied in // ignore the data associated with duplicates supplied in
// the additional names // the additional names
@ -874,6 +875,7 @@ private static class TzInfo {
} }
} }
} }
}
// order the regex alternatives with longer strings first, greedy // order the regex alternatives with longer strings first, greedy
// match will ensure longest string will be consumed // match will ensure longest string will be consumed
for (final String zoneName : sorted) { for (final String zoneName : sorted) {