Minor clean up

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java

@@ -610,7 +610,7 @@ public SettableBeanProperty unwrapped(DeserializationContext ctxt, NameTransform
     /**********************************************************************
      */
 
-    protected void _throwAsJacksonE(JsonParser p, Exception e, Object value)
+    protected void _throwAsJacksonE(JsonParser p, Throwable e, Object value)
         throws JacksonException
     {
         if (e instanceof IllegalArgumentException) {
@@ -633,7 +633,7 @@ protected void _throwAsJacksonE(JsonParser p, Exception e, Object value)
         _throwAsJacksonE(p, e);
     }
 
-    protected void _throwAsJacksonE(JsonParser p, Exception e) throws JacksonException
+    protected void _throwAsJacksonE(JsonParser p, Throwable e) throws JacksonException
     {
         ClassUtil.throwIfRTE(e);
         ClassUtil.throwIfJacksonE(e);
@@ -651,12 +651,6 @@ protected void _throwAsJacksonE(JsonParser p, Exception e) throws JacksonExcepti
         throw DatabindException.from(p, ClassUtil.exceptionMessage(e), e);
     }
 
-    // 10-Oct-2015, tatu: _Should_ be deprecated, too, but its remaining
-    //   callers cannot actually provide a JsonParser
-    protected void _throwAsJacksonE(Exception e, Object value) throws JacksonException {
-        _throwAsJacksonE((JsonParser) null, e, value);
-    }
-
     @Override public String toString() { return "[property '"+getName()+"']"; }
 
     /*

src/main/java/tools/jackson/databind/deser/impl/FieldProperty.java

@@ -193,8 +193,7 @@ public void set(DeserializationContext ctxt, Object instance, Object value)
         try {
             _field.set(instance, value);
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
-            _throwAsJacksonE(e, value);
+            _throwAsJacksonE(ctxt.getParser(), e, value);
         }
     }
 
@@ -209,8 +208,7 @@ public Object setAndReturn(DeserializationContext ctxt, Object instance, Object
         try {
             _field.set(instance, value);
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
-            _throwAsJacksonE(e, value);
+            _throwAsJacksonE(ctxt.getParser(), e, value);
         }
         return instance;
     }

src/main/java/tools/jackson/databind/deser/impl/MethodProperty.java

@@ -184,8 +184,7 @@ public final void set(DeserializationContext ctxt, Object instance, Object value
         try {
             _setter.invoke(instance, value);
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
-            _throwAsJacksonE(e, value);
+            _throwAsJacksonE(ctxt.getParser(), e, value);
         }
     }
 
@@ -202,8 +201,7 @@ public Object setAndReturn(DeserializationContext ctxt,
             Object result = _setter.invoke(instance, value);
             return (result == null) ? instance : result;
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
-            _throwAsJacksonE(e, value);
+            _throwAsJacksonE(ctxt.getParser(), e, value);
             return null;
         }
     }