Fix #2473

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -976,7 +976,12 @@ Andrey Kulikov (ankulikov@github)
   * Reported #2457: Extended enum values are not handled as enums when used as Map keys
   (2.10.1)
 
+João Guerra (joca-bt@github)
+  * Reported #2473: Array index missing in path of `JsonMappingException` for `Collection<String>`,
+   with custom deserializer
+  (2.10.1)
+
 Ryan Bohn (bohnman@github)
-  * Reported `StringCollectionSerializer` calls `JsonGenerator.setCurrentValue(value)`,
+  * Reported #2475: `StringCollectionSerializer` calls `JsonGenerator.setCurrentValue(value)`,
    which messes up current value for sibling properties
   (2.10.1)

release-notes/VERSION-2.x

@@ -8,6 +8,9 @@ Project: jackson-databind
 
 #2457: Extended enum values are not handled as enums when used as Map keys
  (reported by Andrey K)
+#2473: Array index missing in path of `JsonMappingException` for `Collection<String>`,
+  with custom deserializer
+ (reported by João G)
 #2475: `StringCollectionSerializer` calls `JsonGenerator.setCurrentValue(value)`,
   which messes up current value for sibling properties
  (reported by Ryan B)

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

@@ -217,35 +217,39 @@ public Collection<String> deserialize(JsonParser p, DeserializationContext ctxt,
     private Collection<String> deserializeUsingCustom(JsonParser p, DeserializationContext ctxt,
             Collection<String> result, final JsonDeserializer<String> deser) throws IOException
     {
-        while (true) {
-            /* 30-Dec-2014, tatu: This may look odd, but let's actually call method
-             *   that suggest we are expecting a String; this helps with some formats,
-             *   notably XML. Note, however, that while we can get String, we can't
-             *   assume that's what we use due to custom deserializer
-             */
-            String value;
-            if (p.nextTextValue() == null) {
-                JsonToken t = p.getCurrentToken();
-                if (t == JsonToken.END_ARRAY) {
-                    break;
-                }
-                // Ok: no need to convert Strings, but must recognize nulls
-                if (t == JsonToken.VALUE_NULL) {
-                    if (_skipNullValues) {
-                        continue;
+        try {
+            while (true) {
+                /* 30-Dec-2014, tatu: This may look odd, but let's actually call method
+                 *   that suggest we are expecting a String; this helps with some formats,
+                 *   notably XML. Note, however, that while we can get String, we can't
+                 *   assume that's what we use due to custom deserializer
+                 */
+                String value;
+                if (p.nextTextValue() == null) {
+                    JsonToken t = p.getCurrentToken();
+                    if (t == JsonToken.END_ARRAY) {
+                        break;
+                    }
+                    // Ok: no need to convert Strings, but must recognize nulls
+                    if (t == JsonToken.VALUE_NULL) {
+                        if (_skipNullValues) {
+                            continue;
+                        }
+                        value = (String) _nullProvider.getNullValue(ctxt);
+                    } else {
+                        value = deser.deserialize(p, ctxt);
                     }
-                    value = (String) _nullProvider.getNullValue(ctxt);
                 } else {
                     value = deser.deserialize(p, ctxt);
                 }
-            } else {
-                value = deser.deserialize(p, ctxt);
+                result.add(value);
             }
-            result.add(value);
+        } catch (Exception e) {
+            throw JsonMappingException.wrapWithPath(e, result, result.size());
         }
         return result;
     }
-    
+
     @Override
     public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer) throws IOException {
@@ -282,7 +286,11 @@ private final Collection<String> handleNonArray(JsonParser p, DeserializationCon
             }
             value = (String) _nullProvider.getNullValue(ctxt);
         } else {
-            value = (valueDes == null) ? _parseString(p, ctxt) : valueDes.deserialize(p, ctxt);
+            try {
+                value = (valueDes == null) ? _parseString(p, ctxt) : valueDes.deserialize(p, ctxt);
+            } catch (Exception e) {
+                throw JsonMappingException.wrapWithPath(e, result, result.size());
+            }
         }
         result.add(value);
         return result;