Fix #2560

FasterXML · Dec 6, 2019 · a9017ec · a9017ec
1 parent f229cb0
commit a9017ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -1006,3 +1006,7 @@ Mark Schäfer (mark--@github)
 Fabian Lange (CodingFabian@github)
   * Reported #2556: Contention in `TypeNameIdResolver.idFromClass()`
   (2.10.2)
+
+Stefan Wendt (stewe@github)
+  * Reported #2560: Check `WRAP_EXCEPTIONS` in `CollectionDeserializer.handleNonArray()`
+  (2.10.2)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -12,6 +12,8 @@ Project: jackson-databind
  (reported by cpopp@github)
 #2556: Contention in `TypeNameIdResolver.idFromClass()`
  (reported by Fabian L)
+#2560: Check `WRAP_EXCEPTIONS` in `CollectionDeserializer.handleNonArray()`
+ (reported by Stefan W)
 
 2.10.1 (09-Nov-2019)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java
@@ -349,6 +349,10 @@ protected final Collection<Object> handleNonArray(JsonParser p, DeserializationC
                 value = valueDes.deserializeWithType(p, ctxt, typeDeser);
             }
         } catch (Exception e) {
+            boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
+            if (!wrap) {
+                ClassUtil.throwIfRTE(e);
+            }
             // note: pass Object.class, not Object[].class, as we need element type for error info
             throw JsonMappingException.wrapWithPath(e, Object.class, result.size());
         }