Backported #1642 in 2.8.9

FasterXML · Jun 6, 2017 · e2476e0 · e2476e0
1 parent 752bb8a
commit e2476e0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -614,6 +614,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)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -12,6 +12,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)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java
@@ -133,6 +133,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);
         }
     }