Repository: commons-lang Updated Branches: refs/heads/master fd80301b1 -> 8bac0be03
LANG-1285: NullPointerException in FastDateParser$TimeZoneStrategy (closes #212) Replicate the fix for LANG-1186 Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/c14890f0 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/c14890f0 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/c14890f0 Branch: refs/heads/master Commit: c14890f08b9bb47ab8ad27f4dd4c714e32961d0d Parents: fd80301 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Wed Nov 16 07:07:43 2016 +0100 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Wed Nov 16 21:44:41 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/lang3/time/FastDateParser.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/c14890f0/src/main/java/org/apache/commons/lang3/time/FastDateParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java index 2729c7a..a9470d3 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java @@ -866,11 +866,13 @@ public class FastDateParser implements DateParser, Serializable { tzInfo = standard; break; } - final String key = zoneNames[i].toLowerCase(locale); - // ignore the data associated with duplicates supplied in - // the additional names - if (sorted.add(key)) { - tzNames.put(key, tzInfo); + if (zoneNames[i] != null) { + final String key = zoneNames[i].toLowerCase(locale); + // ignore the data associated with duplicates supplied in + // the additional names + if (sorted.add(key)) { + tzNames.put(key, tzInfo); + } } } }
