Merge pull request #1299 from liyuj/master

Timestamp deserialization error

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/DateDeserializers.java

@@ -306,7 +306,12 @@ protected TimestampDeserializer withDateFormat(DateFormat df, String formatStrin
         @Override
         public java.sql.Timestamp deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
         {
-            return new Timestamp(_parseDate(jp, ctxt).getTime());
+            Date d = _parseDate(jp, ctxt);
+            if (d == null){
+                return null;
+            }else{
+                return new Timestamp(d.getTime());
+            }
         }
     }
 }