minor cleanup

FasterXML · Jun 15, 2016 · 522d8f6 · 522d8f6
1 parent 13bbbb5
commit 522d8f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -129,9 +129,6 @@ protected BeanDeserializerBase asArrayDeserializer() {
 
     /**
      * Main deserialization method for bean-based objects (POJOs).
-     *<p>
-     * NOTE: was declared 'final' in 2.2; should NOT be to let extensions
-     * like Afterburner change definition.
      */
     @Override
     public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -247,6 +247,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
             vd = findConvertingContentDeserializer(ctxt, property, vd);
         }
         final JavaType vt = _mapType.getContentType();
+System.err.println("Map deser for "+_mapType+":\n   vt == "+vt);
         if (vd == null) {
             vd = ctxt.findContextualValueDeserializer(vt, property);
         } else { // if directly assigned, probably not yet contextual, so:
@@ -349,7 +350,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt)
         }
         final Map<Object,Object> result = (Map<Object,Object>) _valueInstantiator.createUsingDefault(ctxt);
         if (_standardStringKey) {
-            _readAndBindStringMap(p, ctxt, result);
+            _readAndBindStringKeyMap(p, ctxt, result);
             return result;
         }
         _readAndBind(p, ctxt, result);
@@ -371,7 +372,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt,
             return (Map<Object,Object>) ctxt.handleUnexpectedToken(getMapClass(), p);
         }
         if (_standardStringKey) {
-            _readAndBindStringMap(p, ctxt, result);
+            _readAndBindStringKeyMap(p, ctxt, result);
             return result;
         }
         _readAndBind(p, ctxt, result);
@@ -467,7 +468,7 @@ protected final void _readAndBind(JsonParser p, DeserializationContext ctxt,
      * {@link java.lang.String}s, and there is no custom deserialized
      * specified.
      */
-    protected final void _readAndBindStringMap(JsonParser p, DeserializationContext ctxt,
+    protected final void _readAndBindStringKeyMap(JsonParser p, DeserializationContext ctxt,
             Map<Object,Object> result) throws IOException
     {
         final JsonDeserializer<Object> valueDes = _valueDeserializer;

diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectWithCreator1261Test.java b/src/test/java/com/fasterxml/jackson/failing/ObjectWithCreator1261Test.java
@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.failing;
 
-import java.io.StringReader;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;