further work on AtomicReference deser

Author: cowtowncoder

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

@@ -1302,6 +1302,8 @@ public JsonDeserializer<?> createReferenceDeserializer(DeserializationContext ct
         if (deser == null) {
             // Just one referential type as of JDK 1.7 / Java 7: AtomicReference (Java 8 adds Optional)
             if (AtomicReference.class.isAssignableFrom(type.getRawClass())) {
+                // 19-Apr-2016, tatu: By default we'd get something that expect to see an
+                //   AtomicReference... but what we need is something else, so...
                 return new AtomicReferenceDeserializer(contentType, contentTypeDeser, contentDeser);
             }
         }

src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.java

@@ -22,7 +22,7 @@ public class AtomicReferenceDeserializer
     protected final TypeDeserializer _valueTypeDeserializer;
 
     protected final JsonDeserializer<?> _valueDeserializer;
-    
+
     /**
      * @param referencedType Parameterization of this reference
      */
@@ -84,7 +84,7 @@ public AtomicReference<?> deserialize(JsonParser p, DeserializationContext ctxt)
 
     @Override
     public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer) throws IOException
+            TypeDeserializer typeDeser) throws IOException
     {
         final JsonToken t = p.getCurrentToken();
         if (t == JsonToken.VALUE_NULL) { // can this actually happen?
@@ -96,7 +96,13 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
         if ((t != null) && t.isScalarValue()) {
             return deserialize(p, ctxt);
         }
-        // andn this is what should really happen
-        return typeDeserializer.deserializeTypedFromAny(p, ctxt);
+        // 19-Apr-2016, tatu: Alas, due to there not really being anything for AtomicReference
+        //   itself, need to just ignore `typeDeser`, use TypeDeserializer we do have for contents
+        //   and it might just work.
+
+        if (_valueTypeDeserializer == null) {
+            return deserialize(p, ctxt);
+        }
+        return new AtomicReference<Object>(_valueTypeDeserializer.deserializeTypedFromAny(p, ctxt));
     }
 }

src/test/java/com/fasterxml/jackson/failing/PolymorphicViaRefTypeTest.java

@@ -15,7 +15,7 @@ public AtomicStringWrapper(String str) {
             wrapper = new AtomicReference<StringWrapper>(new StringWrapper(str));
         }
     }
-    
+
     /*
     /**********************************************************************
     /* Test methods