Skip to content

C
common
Commit 79c922a4 authored by Quxl's avatar Quxl
Browse files
Options

x

parent 9cf599bf
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/main/java/com/egolm/common/DateUtil.java
View file @ 79c922a4
...@@ -104,7 +104,9 @@ public class DateUtil { ...@@ -104,7 +104,9 @@ public class DateUtil {
* @return * @return
*/ */
public static Date parse(Object obj) { 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()); return new Date(((Date) obj).getTime());
} else { } else {
String str = String.valueOf(obj).trim(); String str = String.valueOf(obj).trim();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment