avoid NPE when date is null

zhyhzhylove · Jun 12, 2016 · 6b9452a · 6b9452a
1 parent 66139d5
commit 6b9452a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/JavaDeserializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/JavaDeserializer.java
@@ -601,7 +601,7 @@ void deserialize(AbstractHessianInput in, Object obj)
 
       try {
         java.util.Date date = (java.util.Date) in.readObject();
-        value = new java.sql.Date(date.getTime());
+        if (date != null) value = new java.sql.Date(date.getTime());
 
         _field.set(obj, value);
       } catch (Exception e) {