Fixes to help with #1484

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java

@@ -402,7 +402,7 @@ private final Object _vanillaDeserialize(JsonParser p,
             try {
                 prop.deserializeAndSet(p, ctxt, bean);
             } catch (Exception e) {
-                throw wrapAndThrow(e, bean, p.currentName(), ctxt);
+                throw wrapAndThrow(e, bean, prop.getName(), ctxt);
             }
 
             // Elem #2
@@ -415,7 +415,7 @@ private final Object _vanillaDeserialize(JsonParser p,
             try {
                 prop.deserializeAndSet(p, ctxt, bean);
             } catch (Exception e) {
-                throw wrapAndThrow(e, bean, p.currentName(), ctxt);
+                throw wrapAndThrow(e, bean, prop.getName(), ctxt);
             }
             ix = p.nextNameMatch(_propNameMatcher);
         }
@@ -442,7 +442,7 @@ private final Object _vanillaDeserializeWithUnknown(JsonParser p,
                 try {
                     _propsByIndex[ix].deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, p.currentName(), ctxt);
+                    wrapAndThrow(e, bean, _propsByIndex[ix].getName(), ctxt);
                 }
                 continue;
             }
@@ -537,7 +537,7 @@ else if (_objectIdReader != null && p.hasTokenId(JsonTokenId.ID_END_OBJECT)) {
                 try {
                     _propsByIndex[ix].deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    throw wrapAndThrow(e, bean, p.currentName(), ctxt);
+                    throw wrapAndThrow(e, bean, _propsByIndex[ix].getName(), ctxt);
                 }
                 continue;
             }
@@ -846,7 +846,7 @@ protected final Object deserializeWithView(JsonParser p, DeserializationContext
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, p.currentName(), ctxt);
+                    wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }

src/test/java/tools/jackson/databind/deser/jdk/CollectionDeserTest.java

@@ -266,32 +266,42 @@ public void testIterableWithBeans() throws Exception
 
     // for [databind#506]
     @Test
-    public void testArrayIndexForExceptions() throws Exception
+    public void testArrayIndexForExceptions1() throws Exception
     {
-        final String OBJECTS_JSON = "[ \"KEY2\", false ]";
         try {
-            MAPPER.readValue(OBJECTS_JSON, Key[].class);
+            MAPPER.readValue("[ \"KEY2\", false ]", Key[].class);
             fail("Should not pass");
         } catch (MismatchedInputException e) {
-            verifyException(e, "Cannot deserialize");
+            verifyException(e, "Cannot deserialize value of type");
+            verifyException(e, "from Boolean value");
             assertEquals(1, e.getPath().size());
             assertEquals(1, e.getPath().get(0).getIndex());
         }
+    }
 
+    @Test
+    public void testArrayIndexForExceptions2() throws Exception
+    {
         try {
             MAPPER.readValue("[ \"xyz\", { } ]", String[].class);
             fail("Should not pass");
         } catch (MismatchedInputException e) {
-            verifyException(e, "Cannot deserialize");
+            verifyException(e, "Cannot deserialize value of type");
+            verifyException(e, "from Object value");
             assertEquals(1, e.getPath().size());
             assertEquals(1, e.getPath().get(0).getIndex());
         }
+    }
 
+    @Test
+    public void testArrayIndexForExceptions3() throws Exception
+    {
         try {
-            MAPPER.readValue("{\"keys\":"+OBJECTS_JSON+"}", KeyListBean.class);
+            MAPPER.readValue("{\"keys\":[ \"KEY2\", false ]}", KeyListBean.class);
             fail("Should not pass");
         } catch (MismatchedInputException e) {
-            verifyException(e, "Cannot deserialize");
+            verifyException(e, "Cannot deserialize value of type");
+            verifyException(e, "from Boolean value");
             assertEquals(2, e.getPath().size());
             // Bean has no index, but has name:
             assertEquals(-1, e.getPath().get(0).getIndex());