Merge branch '2.8'

Author: cowtowncoder

release-notes/CREDITS

@@ -618,6 +618,10 @@ Andrew Joseph (apjoseph@github)
     for `java.util.UUID`
    (2.8.9)
 
+Joe Littlejohn (joelittlejohn@github)
+  * Contributed #1642: Support `READ_UNKNOWN_ENUM_VALUES_AS_NULL` with `@JsonCreator`
+   (2.8.9)
+
 Connor Kuhn (ckuhn@github)
   * Contributed #1341: FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY
    (2.9.0)

release-notes/VERSION

@@ -99,6 +99,8 @@ Project: jackson-databind
 #1629: `FromStringDeserializer` ignores registered `DeserializationProblemHandler`
   for `java.util.UUID`
  (reported by Andrew J)
+#1642: Support `READ_UNKNOWN_ENUM_VALUES_AS_NULL` with `@JsonCreator`
+ (contributed by Joe L)
 
 2.8.8.1 (19-Apr-2017)
 

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

@@ -134,12 +134,11 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
             return _factory.callOnWith(_valueClass, value);
         } catch (Exception e) {
             Throwable t = ClassUtil.throwRootCauseIfIOE(e);
-
+            // [databind#1642]:
             if (ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL) &&
                     t instanceof IllegalArgumentException) {
                 return null;
             }
-
             return ctxt.handleInstantiationProblem(_valueClass, value, t);
         }
     }

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

@@ -146,18 +146,15 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti
             } catch (IllegalArgumentException | MalformedURLException e) {
                 cause = e;
             }
+            // note: `cause` can't be null
             String msg = "not a valid textual representation";
-            if (cause != null) {
-                String m2 = cause.getMessage();
-                if (m2 != null) {
-                    msg = msg + ", problem: "+m2;
-                }
+            String m2 = cause.getMessage();
+            if (m2 != null) {
+                msg = msg + ", problem: "+m2;
             }
             // 05-May-2016, tatu: Unlike most usage, this seems legit, so...
             JsonMappingException e = ctxt.weirdStringException(text, _valueClass, msg);
-            if (cause != null) {
-                e.initCause(cause);
-            }
+            e.initCause(cause);
             throw e;
             // nothing to do here, yet? We'll fail anyway
         }

src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumDeserializationTest.java

@@ -334,6 +334,7 @@ public void testAllowUnknownEnumValuesReadAsNull() throws Exception
 
     // Ability to ignore unknown Enum values:
 
+    // [databind#1642]
     public void testAllowUnknownEnumValuesReadAsNullWithCreatorMethod() throws Exception
     {
         // can not use shared mapper when changing configs...