Merge branch '2.5'

Conflicts:
	release-notes/CREDITS

Author: cowtowncoder

release-notes/CREDITS

@@ -261,6 +261,10 @@ 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)
+
 Charles Allen (drcrallen@github):
   * Reported #696: Copy constructor does not preserve `_injectableValues`
    (2.6.0)
@@ -299,4 +303,3 @@ Lars Pfannenschmidt (larsp@github)
 Stephen A. Goss (thezerobit@github)
   * Contributed #828: Respect DeserializationFeatures.WRAP_EXCEPTIONS in CollectionDeserializer
    (2.6.0)
-

release-notes/VERSION

@@ -90,6 +90,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)
 

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializer.java

@@ -144,6 +144,7 @@ public final void serialize(Object bean, JsonGenerator gen, SerializerProvider p
         throws IOException
     {
         if (_objectIdWriter != null) {
+            gen.setCurrentValue(bean); // [databind#631]
             _serializeWithObjectId(bean, gen, provider, true);
             return;
         }

src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.databind.ser.impl;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
@@ -106,37 +106,37 @@ protected BeanSerializerBase asArraySerializer() {
      * {@link BeanPropertyWriter} instances.
      */
     @Override
-    public final void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+    public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) throws IOException
     {
+        gen.setCurrentValue(bean); // [databind#631]
         if (_objectIdWriter != null) {
-            _serializeWithObjectId(bean, jgen, provider, false);
+            _serializeWithObjectId(bean, gen, provider, false);
             return;
         }
         if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
+            serializeFieldsFiltered(bean, gen, provider);
         } else {
-            serializeFields(bean, jgen, provider);
+            serializeFields(bean, gen, provider);
         }
     }
 
     @Override
-    public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
+    public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider provider,
+    		TypeSerializer typeSer) throws IOException
     {
         if (provider.isEnabled(SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS)) {
             throw new JsonMappingException("Unwrapped property requires use of type information: can not serialize without disabling `SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS`");
         }
 
+        gen.setCurrentValue(bean); // [databind#631]
         if (_objectIdWriter != null) {
-            _serializeWithObjectId(bean, jgen, provider, typeSer);
+            _serializeWithObjectId(bean, gen, provider, typeSer);
             return;
         }
-
         if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
+            serializeFieldsFiltered(bean, gen, provider);
         } else {
-            serializeFields(bean, jgen, provider);
+            serializeFields(bean, gen, provider);
         }
     }
 

src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java

@@ -548,6 +548,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
         throws IOException
     {
         if (_objectIdWriter != null) {
+            gen.setCurrentValue(bean); // [databind#631]
             _serializeWithObjectId(bean, gen, provider, typeSer);
             return;
         }
@@ -558,6 +559,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
         } else {
             typeSer.writeCustomTypePrefixForObject(bean, gen, typeStr);
         }
+        gen.setCurrentValue(bean); // [databind#631]
         if (_propertyFilterId != null) {
             serializeFieldsFiltered(bean, gen, provider);
         } else {
@@ -570,10 +572,8 @@ public void serializeWithType(Object bean, JsonGenerator gen,
         }
     }
 
-    protected final void _serializeWithObjectId(Object bean,
-            JsonGenerator gen, SerializerProvider provider,
-            boolean startEndObject)
-        throws IOException, JsonGenerationException
+    protected final void _serializeWithObjectId(Object bean, JsonGenerator gen, SerializerProvider provider,
+            boolean startEndObject) throws IOException
     {
         final ObjectIdWriter w = _objectIdWriter;
         WritableObjectId objectId = provider.findObjectId(bean, w.generator);
@@ -601,10 +601,8 @@ protected final void _serializeWithObjectId(Object bean,
         }
     }
 
-    protected final void _serializeWithObjectId(Object bean,
-            JsonGenerator gen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
+    protected final void _serializeWithObjectId(Object bean, JsonGenerator gen, SerializerProvider provider,
+            TypeSerializer typeSer) throws IOException
     {
         final ObjectIdWriter w = _objectIdWriter;
         WritableObjectId objectId = provider.findObjectId(bean, w.generator);
@@ -622,10 +620,9 @@ protected final void _serializeWithObjectId(Object bean,
         _serializeObjectId(bean, gen, provider, typeSer, objectId);
     }
 
-    protected  void _serializeObjectId(Object bean,
-            JsonGenerator gen,SerializerProvider provider,
-            TypeSerializer typeSer, WritableObjectId objectId)
-        throws IOException, JsonProcessingException, JsonGenerationException {
+    protected  void _serializeObjectId(Object bean, JsonGenerator gen,SerializerProvider provider,
+            TypeSerializer typeSer, WritableObjectId objectId) throws IOException
+    {
         final ObjectIdWriter w = _objectIdWriter;
         String typeStr = (_typeId == null) ? null :_customTypeId(bean);
         if (typeStr == null) {