backport #324 fix for 2.2.4

Author: cowtowncoder

release-notes/VERSION

@@ -2,6 +2,7 @@ Project: jackson-databind
 Version: 2.2.4 (xx-xxx-2013)
 
 #292: Problems with abstract `Map`s, `Collection`s, polymorphic deserialization
+#324: EnumDeserializer should throw JsonMappingException, not IllegalArgumentException
 
 ------------------------------------------------------------------------
 === History: ===

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

@@ -161,9 +161,12 @@ public Object deserialize(JsonParser jp, DeserializationContext ctxt)
             try {
                 return _factory.invoke(_enumClass, value);
             } catch (Exception e) {
-                ClassUtil.unwrapAndThrowAsIAE(e);
+                Throwable t = ClassUtil.getRootCause(e);
+                if (t instanceof IOException) {
+                    throw (IOException) t;
+                }
+                throw ctxt.instantiationException(_enumClass, t);
             }
-            return null;
         }
     }
 }

src/test/java/com/fasterxml/jackson/databind/deser/TestEnumDeserialization.java

@@ -97,6 +97,16 @@ private TestEnumFor834(int id) {
         }
     }
 
+    // [Issue#324]: exception from creator method
+    protected enum TestEnum324
+    {
+        A, B;
+        
+        @JsonCreator public static TestEnum324 creator(String arg) {
+            throw new RuntimeException("Foobar!");
+        }
+    }
+    
     /*
     /**********************************************************
     /* Tests
@@ -318,8 +328,7 @@ public void testDoNotAllowUnknownEnumValuesAsMapKeysWhenReadAsNullDisabled() thr
     // [JACKSON-834]
     public void testEnumsFromInts() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        TestEnumFor834 res = mapper.readValue("1 ", TestEnumFor834.class);
+        TestEnumFor834 res = MAPPER.readValue("1 ", TestEnumFor834.class);
         assertSame(TestEnumFor834.ENUM_A, res);
     }