Merge branch '2.6' into 2.7

Conflicts:
	release-notes/VERSION

Author: cowtowncoder

release-notes/VERSION

@@ -8,6 +8,8 @@ Project: jackson-databind
 
 #1225: `JsonMappingException` should override getProcessor()
  (reported by Nick B)
+#1228: @JsonAnySetter does not deserialize null to Deserializer's NullValue
+ (contributed by Eric S)
 
 2.7.4 (29-Apr-2016)
 

src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java

@@ -130,7 +130,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
     {
         JsonToken t = p.getCurrentToken();
         if (t == JsonToken.VALUE_NULL) {
-            return null;
+            return _valueDeserializer.getNullValue(ctxt);
         }
         if (_valueTypeDeserializer != null) {
             return _valueDeserializer.deserializeWithType(p, ctxt, _valueTypeDeserializer);

src/test/java/com/fasterxml/jackson/databind/deser/TestNullHandling.java

@@ -2,10 +2,11 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -23,12 +24,51 @@ public String deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
         public String getNullValue(DeserializationContext ctxt) { return "funny"; }
     }
 
+    static class AnySetter{
+
+        private Map<String,String> any = new HashMap<String,String>();
+
+        @JsonAnySetter
+        public void setAny(String name, String value){
+            this.any.put(name,value);
+        }
+
+        public Map<String,String> getAny(){
+            return this.any;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
+    public void testAnySetterNulls() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        SimpleModule module = new SimpleModule("test", Version.unknownVersion());
+        module.addDeserializer(String.class, new FunnyNullDeserializer());
+        mapper.registerModule(module);
+
+        String fieldName = "fieldName";
+        String nullValue = "{\""+fieldName+"\":null}";
+
+        // should get non-default null directly:
+        AnySetter result = mapper.readValue(nullValue, AnySetter.class);
+
+        assertEquals(1, result.getAny().size());
+        assertNotNull(result.getAny().get(fieldName));
+        assertEquals("funny", result.getAny().get(fieldName));
+
+        // as well as via ObjectReader
+        ObjectReader reader = mapper.readerFor(AnySetter.class);
+        result = reader.readValue(nullValue);
+
+        assertEquals(1, result.getAny().size());
+        assertNotNull(result.getAny().get(fieldName));
+        assertEquals("funny", result.getAny().get(fieldName));
+    }
+
     // Test for [JACKSON-643]
     public void testCustomRootNulls() throws Exception
     {