Merge branch '2.7'

Author: cowtowncoder

release-notes/VERSION

@@ -72,6 +72,8 @@ Project: jackson-databind
  (reported by brentryan@github)
 #1279: Ensure DOM parsing defaults to not expanding external entities
 #1288: Type id not exposed for `JsonTypeInfo.As.EXTERNAL_PROPERTY` even when `visible` set to `true`
+#1299: Timestamp deserialization error
+ (reported by liyuj@github)
 #1301: Problem with `JavaType.toString()` for recursive (self-referential) types
  (reported by Brian P)
 #1307: `TypeWrappedDeserializer` doesn't delegate the `getNullValue()` method to `_deserializer`

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

@@ -306,7 +306,8 @@ 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);
+            return (d == null) ? null : new Timestamp(d.getTime());
         }
     }
 }