Fixing the NPE in case of null entry for "Date Time" type in ODA data…

… source
eclipse-birt · Dec 28, 2018 · d5130df · d5130df
1 parent 3bc8944
commit d5130df
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/DateFormatISO8601.java b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/DateFormatISO8601.java
@@ -53,7 +53,10 @@ public static Date parse( String source, TimeZone timeZone ) throws BirtExceptio
 			{
 				dateFormat.setTimeZone( timeZone );
 			}
-			resultDate = dateFormat.parse( source );
+			if ( dateFormat != null )
+			{
+				resultDate = dateFormat.parse( source );
+			}
 			return resultDate;
 		}
 		catch ( ParseException e )