Fix #1907

Author: cowtowncoder

release-notes/CREDITS renamed to release-notes/CREDITS-2.x

@@ -738,3 +738,7 @@ Alexander Skvortcov (askvortcov@github)
   * Reported #1853: Deserialise from Object (using Creator methods) returns field name
     instead of value
    (2.9.4)
+
+Joe Schafer (jschaf@github)
+  * Reported #1907: Remove `getClass()` from `_valueType` argument for error reporting
+   (2.9.4)

release-notes/VERSION-2.x

@@ -1,5 +1,4 @@
-Project: jackson-databind
-------------------------------------------------------------------------
+Project: jackson-databin------------------------------------------------------------------------
 === Releases === 
 ------------------------------------------------------------------------
 
@@ -28,6 +27,8 @@ Project: jackson-databind
  (reported by mcortella@github)
 #1899: Another two gadgets to exploit default typing issue in jackson-databind
  (reported by OneSourceCat@github)
+#1907: Remove `getClass()` from `_valueType` argument for error reporting
+ (reported by Joe S)
 
 2.9.3 (09-Dec-2017)
 

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

@@ -177,18 +177,17 @@ protected Object deserializeEnumUsingPropertyBased(final JsonParser p, final Des
     // ************ Got the below methods from BeanDeserializer ********************//
 
     protected final Object _deserializeWithErrorWrapping(JsonParser p, DeserializationContext ctxt,
-    		SettableBeanProperty prop) throws IOException {
-    	try {
-    		return prop.deserialize(p, ctxt);
-    	} catch (Exception e) {
-    		wrapAndThrow(e, _valueClass.getClass(), prop.getName(), ctxt);
-    		// never gets here, unless caller declines to throw an exception
-    		return null;
-    	}
+            SettableBeanProperty prop) throws IOException
+    {
+        try {
+            return prop.deserialize(p, ctxt);
+        } catch (Exception e) {
+            return wrapAndThrow(e, handledType(), prop.getName(), ctxt);
+        }
     }
 
-    public void wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)
-    		throws IOException
+    protected Object wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)
+            throws IOException
     {
         throw JsonMappingException.wrapWithPath(throwOrReturnThrowable(t, ctxt), bean, fieldName);
     }
@@ -209,4 +208,4 @@ private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctx
         }
         return t;
     }
-}
+}