Fix #878

FasterXML · Jul 29, 2015 · 4312a24 · 4312a24
1 parent 726b6e0
commit 4312a24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -261,4 +261,8 @@ Kamil Benedykciński (Kamil-Benedykcinski@github)
    in `JsonMappingException`
    (2.5.4)
 
+Chi Kim (chikim79@github)
+  * Reported #878: serializeWithType on BeanSerializer does not setCurrentValue
+   (2.5.5 / 2.6.1)
+
 
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -9,6 +9,8 @@ Project: jackson-databind
 #844: Using JsonCreator still causes invalid path references in JsonMappingException
  (reported by Ian B)
 #852: Accept scientific number notation for quoted numbers too
+#878: serializeWithType on BeanSerializer does not setCurrentValue
+ (reported by Chi K, chikim79@github)
 
 2.5.4 (09-Jun-2015)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
@@ -546,6 +546,8 @@ public void serializeWithType(Object bean, JsonGenerator gen,
         } else {
             typeSer.writeCustomTypePrefixForObject(bean, gen, typeStr);
         }
+        // [databind#631]: Assign current value, to be accessible by custom serializers
+        gen.setCurrentValue(bean);
         if (_propertyFilterId != null) {
             serializeFieldsFiltered(bean, gen, provider);
         } else {