Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1007,6 +1007,10 @@ 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)
+
 Ville Koskela (vjkoskela@github)
   * Contributed #2487: BeanDeserializerBuilder Protected Factory Method for Extension
   (2.11.0)
@@ -1026,4 +1030,4 @@ Robert Diebels (RobertDiebels@github)
 Joseph Koshakow (jkosh44@github)
   * Contributed fix for #2515: `ObjectMapper.registerSubtypes(NamedType...)` doesn't allow registering
     the same POJO for two different type ids
- (contributed by Joseph	 K)
+ (2.11.0)

release-notes/VERSION-2.x

@@ -33,6 +33,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)
 

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());
         }