commit c14890f08b9bb47ab8ad27f4dd4c714e32961d0d
author Francesco Chicchiriccò <ilgrosso@apache.org> Wed Nov 16 07:07:43 2016 +0100
committer pascalschumacher <pascalschumacher@gmx.net> Wed Nov 16 21:44:41 2016 +0100
tree f153abe96e77fc51f9737b19a0d34aa87c6c6005
parent fd80301b1eeb4b2db55a09aeb54348faacec11cd

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

Replicate the fix for LANG-1186

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 @@ private static class TzInfo {
                         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);
+                        }
                     }
                 }
             }