x

79c922a4 · Quxl · 9cf599bf · 79c922a4
Commit 79c922a4 authored Dec 07, 2020 by Quxl
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

DateUtil.java src/main/java/com/egolm/common/DateUtil.java +3 -1

No files found.
--- a/src/main/java/com/egolm/common/DateUtil.java
+++ b/src/main/java/com/egolm/common/DateUtil.java
@@ -104,7 +104,9 @@ public class DateUtil {
 	 * @return
 	 */
 	public static Date parse(Object obj) {
-		if (obj instanceof Date) {
+		if(obj == null) {
+			return null;
+		} else if (obj instanceof Date) {
 			return new Date(((Date) obj).getTime());
 		} else {
 			String str = String.valueOf(obj).trim();