From d5130dfe8fb607afbcfe8ce4699229d834daa25e Mon Sep 17 00:00:00 2001
From: bsrujank <bsrujank@opentext.com>
Date: Fri, 28 Dec 2018 11:39:53 +0530
Subject: [PATCH] Fixing the NPE in case of null entry for "Date Time" type in
 ODA data source

---
 .../src/org/eclipse/birt/core/data/DateFormatISO8601.java    | 5 ++++-
 1 file changed, 4 insertions(+), 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
index 769f89c45c1..a5d128bc1af 100644
--- 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 )