x

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

@@ -30,7 +30,7 @@ public class DateUtil {
 	public static Object parseDate(String dateString, String fmt) {
 		if ("00000000".equals(dateString)) {
 			return "0000-00-00";
-		} else {
+		}  else {
 			try {
 				DateFormat df = getFmt(fmt);
 				return df.parse(dateString);
@@ -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) {