backport #423 in 2.3

FasterXML · Mar 14, 2014 · 3a7a417 · 3a7a417
1 parent e6e15a5
commit 3a7a417
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -3,6 +3,8 @@ Version: 2.3.3 (xx-xxx-2014)
 
 #420: Remove 'final' modifier from `BeanDeserializerBase.deserializeWithType`
  (requested by Ghoughpteighbteau@github)
+#423: Fix `CalendarSerializer` to work with custom format
+ (repored by sergeymetallic@github)
 
 ------------------------------------------------------------------------
 === History: ===

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.java
@@ -49,7 +49,7 @@ public void serialize(Calendar value, JsonGenerator jgen, SerializerProvider pro
  } else if (_customFormat != null) {
  // 21-Feb-2011, tatu: not optimal, but better than alternatives:
  synchronized (_customFormat) {
- jgen.writeString(_customFormat.format(value));
+ jgen.writeString(_customFormat.format(value.getTime()));
  }
  } else {
  provider.defaultSerializeDateValue(value.getTime(), jgen);

diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestDateSerialization.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestDateSerialization.java
@@ -158,7 +158,7 @@ public void testDateWithJsonFormat() throws Exception
 
  // and for [Issue#423] as well:
  json = mapper.writer().with(getUTCTimeZone()).writeValueAsString(new CalendarAsStringBean(0L));
- assertEquals("{\"date\":\"1970-01-01\"}", json);
+ assertEquals("{\"value\":\"1970-01-01\"}", json);
  }
 
  /**