x

ba1c256a · Quxl · 355f14f2 · ba1c256a
Commit ba1c256a authored Jul 26, 2019 by Quxl
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

DateUtil.java src/main/java/com/egolm/sso/util/DateUtil.java +3 -5

No files found.
--- a/src/main/java/com/egolm/sso/util/DateUtil.java
+++ b/src/main/java/com/egolm/sso/util/DateUtil.java
@@ -41,13 +41,11 @@ public class DateUtil {
 	}
 	public static Object parseDateNoEmpty(String dateString, String fmt) {
-		Object res;
 		if (dateString != null && !dateString.equals("")) {
-			res = parseDate(dateString, fmt);
+			return parseDate(dateString, fmt);
 		} else {
-			res = new Date(0);
+			return "0000-00-00";
 		}
-		return res;
 	}
 	public static DateFormat getFmt(String fmt) {