Fix minor temporary regression wrt ThrowableDeserializer

Author: cowtowncoder

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

@@ -47,18 +47,18 @@ public class BeanDeserializerBuilder
     /* Accumulated information about properties
     /**********************************************************
      */
-    
+
     /**
      * Properties to deserialize collected so far.
      */
     final protected Map<String, SettableBeanProperty> _properties
         = new LinkedHashMap<String, SettableBeanProperty>();
-    
+
     /**
      * Value injectors for deserialization
      */
     protected List<ValueInjector> _injectables;
-    
+
     /**
      * Back-reference properties this bean contains (if any)
      */
@@ -69,7 +69,7 @@ public class BeanDeserializerBuilder
      * purposes (meaning no exception is thrown, value is just skipped).
      */
     protected HashSet<String> _ignorableProps;
-    
+
     /**
      * Object that will handle value instantiation for the bean type.
      */
@@ -80,7 +80,7 @@ public class BeanDeserializerBuilder
      * bean type.
      */
     protected ObjectIdReader _objectIdReader;
-    
+
     /**
      * Fallback setter used for handling any properties that are not
      * mapped to regular setters. If setter is not null, it will be
@@ -110,7 +110,7 @@ public class BeanDeserializerBuilder
     /* Life-cycle: construction
     /**********************************************************
      */
-    
+
     public BeanDeserializerBuilder(BeanDescription beanDesc,
             DeserializationContext ctxt)
     { 
@@ -137,10 +137,10 @@ protected BeanDeserializerBuilder(BeanDeserializerBuilder src)
         _ignorableProps = src._ignorableProps;        
         _valueInstantiator = src._valueInstantiator;
         _objectIdReader = src._objectIdReader;
-        
+
         _anySetter = src._anySetter;
         _ignoreAllUnknown = src._ignoreAllUnknown;
-        
+
         _buildMethod = src._buildMethod;
         _builderConfig = src._builderConfig;
     }

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

@@ -371,20 +371,16 @@ public JsonDeserializer<Object> buildThrowableDeserializer(DeserializationContex
         // (and assume there won't be any back references)
 
         // But then let's decorate things a bit
-        /* To resolve [JACKSON-95], need to add "initCause" as setter
-         * for exceptions (sub-classes of Throwable).
-         */
+        // Need to add "initCause" as setter for exceptions (sub-classes of Throwable).
         AnnotatedMethod am = beanDesc.findMethod("initCause", INIT_CAUSE_PARAMS);
         if (am != null) { // should never be null
             SimpleBeanPropertyDefinition propDef = SimpleBeanPropertyDefinition.construct(ctxt.getConfig(), am,
                     new PropertyName("cause"));
             SettableBeanProperty prop = constructSettableProperty(ctxt, beanDesc, propDef,
                     am.getParameterType(0));
             if (prop != null) {
-                /* 21-Aug-2011, tatus: We may actually have found 'cause' property
-                 *   to set... but let's replace it just in case,
-                 *   otherwise can end up with odd errors.
-                 */
+                // 21-Aug-2011, tatus: We may actually have found 'cause' property
+                //   to set... but let's replace it just in case, otherwise can end up with odd errors.
                 builder.addOrReplaceProperty(prop, true);
             }
         }
@@ -393,10 +389,10 @@ public JsonDeserializer<Object> buildThrowableDeserializer(DeserializationContex
         builder.addIgnorable("localizedMessage");
         // Java 7 also added "getSuppressed", skip if we have such data:
         builder.addIgnorable("suppressed");
-        /* As well as "message": it will be passed via constructor,
-         * as there's no 'setMessage()' method
-         */
-        builder.addIgnorable("message");
+        // As well as "message": it will be passed via constructor,
+        // as there's no 'setMessage()' method
+        // 23-Jan-2018, tatu: ... although there MAY be Creator Property... which is problematic
+//        builder.addIgnorable("message");
 
         // update builder now that all information is in?
         if (_factoryConfig.hasDeserializerModifiers()) {

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

@@ -105,7 +105,8 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
             }
 
             // Maybe it's "message"?
-            if (PROP_NAME_MESSAGE.equals(propName)) {
+            final boolean isMessage = PROP_NAME_MESSAGE.equals(propName);
+            if (isMessage) {
                 if (hasStringCreator) {
                     throwable = _valueInstantiator.createFromString(ctxt, p.getValueAsString());
                     // any pending values?
@@ -128,6 +129,9 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
                 _anySetter.deserializeAndSet(p, ctxt, throwable, propName);
                 continue;
             }
+            // 23-Jan-2018, tatu: One concern would be `message`, but without any-setter or single-String-ctor
+            //   (or explicit constructor). We could just ignore it but for now, let it fail
+
             // Unknown: let's call handler method
             handleUnknownProperty(p, ctxt, throwable, propName);
         }