Merge branch '2.7'

Author: cowtowncoder

release-notes/VERSION

@@ -74,6 +74,8 @@ Project: jackson-databind
 #1288: Type id not exposed for `JsonTypeInfo.As.EXTERNAL_PROPERTY` even when `visible` set to `true`
 #1301: Problem with `JavaType.toString()` for recursive (self-referential) types
  (reported by Brian P)
+#1307: `TypeWrappedDeserializer` doesn't delegate the `getNullValue()` method to `_deserializer`
+ (reported by vfries@github)
 
 2.7.5 (11-Jun-2016)
 

src/main/java/com/fasterxml/jackson/databind/deser/impl/TypeWrappedDeserializer.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind.deser.impl;
 
 import java.io.IOException;
+import java.util.Collection;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.*;
@@ -35,6 +36,26 @@ public TypeWrappedDeserializer(TypeDeserializer typeDeser, JsonDeserializer<?> d
     public Class<?> handledType() {
         return _deserializer.handledType();
     }
+
+    @Override
+    public JsonDeserializer<?> getDelegatee() {
+        return _deserializer.getDelegatee();
+    }
+
+    @Override
+    public Collection<Object> getKnownPropertyNames() {
+        return _deserializer.getKnownPropertyNames();
+    }
+
+    @Override
+    public Object getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+        return _deserializer.getNullValue(ctxt);
+    }
+
+    @Override
+    public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {
+        return _deserializer.getEmptyValue(ctxt);
+    }
 
     @Override
     public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException

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

@@ -267,4 +267,16 @@ public void testEmpty1256() throws Exception
         String json = mapper.writeValueAsString(new Issue1256Bean());
         assertEquals("{}", json);
     }
+
+    // [databind#1307]
+    @SuppressWarnings("unchecked")
+    public void testNullValueHandling() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        AtomicReference<Double> inputData = new AtomicReference<Double>();
+        String json = mapper.writeValueAsString(inputData);
+        AtomicReference<Double> readData = (AtomicReference<Double>) mapper.readValue(json, AtomicReference.class);
+        assertNotNull(readData);
+        assertNull(readData.get());
+    }
 }