Fix #774 for 2.5.4

FasterXML · Apr 29, 2015 · b02bf06 · b02bf06
1 parent db612bb
commit b02bf06
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -8,6 +8,8 @@ Project: jackson-databind
 
 #771: Annotation bundles ignored when added to Mixin
  (reported by Andrew D)
+#774: NPE from SqlDateSerializer as _useTimestamp is not checked for being null
+ (reported by mrowkow@github)
 - Fix handling of Enums wrt JSON Schema, when 'toString()' used for serialization
 
 2.5.3 (24-Apr-2015)

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/DateSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/DateSerializer.java
@@ -42,18 +42,18 @@ protected long _timestamp(Date value) {
     }
 
     @Override
-    public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(Date value, JsonGenerator gen, SerializerProvider provider)
         throws IOException, JsonGenerationException
     {
         if (_asTimestamp(provider)) {
-            jgen.writeNumber(_timestamp(value));
+            gen.writeNumber(_timestamp(value));
         } else if (_customFormat != null) {
             // 21-Feb-2011, tatu: not optimal, but better than alternatives:
             synchronized (_customFormat) {
-                jgen.writeString(_customFormat.format(value));
+                gen.writeString(_customFormat.format(value));
             }
         } else {
-            provider.defaultSerializeDateValue(value, jgen);
+            provider.defaultSerializeDateValue(value, gen);
         }
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
@@ -42,13 +42,13 @@ protected long _timestamp(java.sql.Date value) {
     }
 
     @Override
-    public void serialize(java.sql.Date value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(java.sql.Date value, JsonGenerator gen, SerializerProvider provider)
         throws IOException, JsonGenerationException
     {
-        if (_useTimestamp) {
-            jgen.writeNumber(_timestamp(value));
+        if (_asTimestamp(provider)) {
+            gen.writeNumber(_timestamp(value));
         } else {
-        	jgen.writeString(value.toString());
+            gen.writeString(value.toString());
         }
     }