commit b14a79bd4b583756e868a02a668ebeb99d38931b
author Tatu Saloranta <tatu.saloranta@iki.fi> Fri Apr 21 19:06:08 2017 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Fri Apr 21 19:06:08 2017 -0700
tree 6e5eea645edae9c8d79d840ce2fd9d698394c83f
parent a83d368377abef5a093a9130eb090d88c415eed7

...

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
index 44ed6f9..fae117e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
+++ b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
@@ -1418,15 +1418,13 @@
      *
      * @since 2.9
      */
-    public <T> T reportBadMerge(JsonDeserializer<?> deser) throws JsonMappingException {
+    public <T> T reportBadMerge(JsonDeserializer<?> deser) throws JsonMappingException
+    {
         if (isEnabled(MapperFeature.IGNORE_MERGE_FOR_UNMERGEABLE)) {
             return null;
         }
-
-        Class<?> raw = deser.handledType();
-        JavaType type = constructType(raw);
-        String msg = String.format("Invalid configuration: values of type %s can not be merged",
-                type);
+        JavaType type = constructType(deser.handledType());
+        String msg = String.format("Invalid configuration: values of type %s can not be merged", type);
         throw InvalidDefinitionException.from(getParser(), msg, type);
     }
 

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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java
index a889c93..42fed4e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java
@@ -62,7 +62,8 @@
     // Since we can never have type info ("natural type"; String, Boolean, Integer, Double):
     // (is it an error to even call this version?)
     @Override
-    public String deserializeWithType(JsonParser p, DeserializationContext ctxt, TypeDeserializer typeDeserializer) throws IOException {
+    public String deserializeWithType(JsonParser p, DeserializationContext ctxt,
+            TypeDeserializer typeDeserializer) throws IOException {
         return deserialize(p, ctxt);
     }
 }

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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
index 3c8baee..be16318 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
@@ -200,9 +200,8 @@
 
     @Override // since 2.9
     public Boolean supportsUpdate(DeserializationConfig config) {
-        // 23-Oct-2016, tatu: In theory, some values would be updateable (Maps, Collections),
-        //    but seems very error prone, so for now declare that we do not support it.
-        return Boolean.FALSE;
+        // 21-Apr-2017, tatu: Bit tricky... some values, yes. So let's say "dunno"
+        return null;
     }
 
     @Override
@@ -475,9 +474,8 @@
 
         @Override // since 2.9
         public Boolean supportsUpdate(DeserializationConfig config) {
-            // 23-Oct-2016, tatu: In theory, some values would be updateable (Maps, Collections),
-            //    but seems very error prone, so for now declare that we do not support it.
-            return Boolean.FALSE;
+            // 21-Apr-2017, tatu: Bit tricky... some values, yes. So let's say "dunno"
+            return null;
         }
 
         @Override