x

src/main/java/com/egolm/sso/util/DateUtil.java

@@ -33,10 +33,14 @@ public class DateUtil {
 	
 	public static final DateFormat format_HHmmss = new SimpleDateFormat("HHmmss");
 	public static Date parseTime_HHmmss(String timeString) {
-		try {
-			return format_HHmmss.parse(timeString);
-		} catch (ParseException e) {
-			throw new XRException("Error time value " + timeString, e);
+		if (timeString == null || timeString.trim().length() == 0) {
+			return null;
+		} else {
+			try {
+				return format_HHmmss.parse(timeString);
+			} catch (ParseException e) {
+				throw new XRException("Error time value " + timeString, e);
+			}
 		}
 	}