Declare wrapAndThrows to return an IOException to allow callers to use in order to improve readability and code coverage. It also has the side-effect of ensuring all paths through wrapAndThrow actually throw because they would otherwise be required to return an IOException. (#1871)

vjkoskela · cowtowncoder · commit af413a0cbeb4 · 2018-01-03T12:46:32.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -285,7 +285,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean
             try {
                 prop.deserializeAndSet(p, ctxt, bean);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, prop.getName(), ctxt);
+                throw wrapAndThrow(e, bean, prop.getName(), ctxt);
             }
             ix = p.nextFieldName(_fieldMatcher);
         }
@@ -396,7 +396,7 @@ private final Object _vanillaDeserialize(JsonParser p,
             try {
                 prop.deserializeAndSet(p, ctxt, bean);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, p.currentName(), ctxt);
+                throw wrapAndThrow(e, bean, p.currentName(), ctxt);
             }
 
             // Elem #2
@@ -409,7 +409,7 @@ private final Object _vanillaDeserialize(JsonParser p,
             try {
                 prop.deserializeAndSet(p, ctxt, bean);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, p.currentName(), ctxt);
+                throw wrapAndThrow(e, bean, p.currentName(), ctxt);
             }
             ix = p.nextFieldName(_fieldMatcher);
         }
@@ -522,7 +522,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
                 try {
                     _fieldsByIndex[ix].deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, p.currentName(), ctxt);
+                    throw wrapAndThrow(e, bean, p.currentName(), ctxt);
                 }
                 continue;
             }
@@ -630,7 +630,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                 try {
                     buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
                 } catch (Exception e) {
-                    wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
+                    throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                 }
                 continue;
             }
@@ -687,9 +687,7 @@ protected final Object _deserializeWithErrorWrapping(JsonParser p,
         try {
             return prop.deserialize(p, ctxt);
         } catch (Exception e) {
-            wrapAndThrow(e, _beanType.getRawClass(), prop.getName(), ctxt);
-            // never gets here, unless caller declines to throw an exception
-            return null;
+            throw wrapAndThrow(e, _beanType.getRawClass(), prop.getName(), ctxt);
         }
     }
 
@@ -800,7 +798,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -834,7 +832,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
             try {
                 _anySetter.deserializeAndSet(b2.asParserOnFirstToken(), ctxt, bean, propName);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, propName, ctxt);
+                throw wrapAndThrow(e, bean, propName, ctxt);
             }
         }
         tokens.writeEndObject();
@@ -865,7 +863,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -897,9 +895,8 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 try {
                     _anySetter.deserializeAndSet(b2.asParserOnFirstToken(), ctxt, bean, propName);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
+                    throw wrapAndThrow(e, bean, propName, ctxt);
                 }
-                continue;
             }
         }
         tokens.writeEndObject();
@@ -991,9 +988,8 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                     buffer.bufferAnyProperty(_anySetter, propName,
                             _anySetter.deserialize(b2.asParserOnFirstToken(), ctxt));
                 } catch (Exception e) {
-                    wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
+                    throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                 }
-                continue;
             }
         }
 
@@ -1056,7 +1052,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -1082,7 +1078,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont
                 try {
                     _anySetter.deserializeAndSet(p, ctxt, bean, propName);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
+                    throw wrapAndThrow(e, bean, propName, ctxt);
                 }
                 continue;
             }
@@ -1123,8 +1119,7 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
                         try {
                             bean = creator.build(ctxt, buffer);
                         } catch (Exception e) {
-                            wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                            continue; // never gets here
+                            throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                         }
                         // if so, need to copy all remaining tokens into buffer
                         while (t == JsonToken.FIELD_NAME) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
@@ -1495,7 +1495,7 @@ protected void handleUnknownVanilla(JsonParser p, DeserializationContext ctxt,
                // should we consider return type of any setter?
                 _anySetter.deserializeAndSet(p, ctxt, bean, propName);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, propName, ctxt);
+                throw wrapAndThrow(e, bean, propName, ctxt);
             }
         } else {
             // Unknown: let's call handler method
@@ -1636,8 +1636,14 @@ protected JsonDeserializer<Object> _findSubclassDeserializer(DeserializationCont
      * <li>"Plain" IOExceptions (ones that are not of type
      *   {@link JsonMappingException} are to be passed as is
      *</ul>
+     * The method always throws but declares its return type as
+     * {@link IOException} in order to allow callers to invoke method as
+     * {@code throw wrapAndThrow(...);} thereby ensuring complete code
+     * coverage is possible. This also ensures that all call paths within
+     * this method throw an exception; otherwise they would be required
+     * to return.
      */
-    public void wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)
+    public IOException wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)
         throws IOException
     {
         // Need to add reference information
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -294,7 +294,7 @@ private final Object _vanillaDeserialize(JsonParser p, DeserializationContext ct
                 try {
                     builder = prop.deserializeSetAndReturn(p, ctxt, builder);
                 } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, builder, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -343,7 +343,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt)
                 try {
                     bean = _fieldsByIndex[ix].deserializeSetAndReturn(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, p.currentName(), ctxt);
+                    throw wrapAndThrow(e, bean, p.currentName(), ctxt);
                 }
                 continue;
             }
@@ -399,8 +399,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
                     try {
                         builder = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
+                        throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                     }
                     //  polymorphic?
                     if (builder.getClass() != _beanType.getRawClass()) {
@@ -496,7 +495,7 @@ protected final Object _deserialize(JsonParser p,
                 try {
                     builder = prop.deserializeSetAndReturn(p, ctxt, builder);
                 } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, builder, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -532,7 +531,7 @@ protected final Object deserializeWithView(JsonParser p, DeserializationContext
                 try {
                     bean = prop.deserializeSetAndReturn(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -589,7 +588,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 try {
                     bean = prop.deserializeSetAndReturn(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -614,7 +613,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 try {
                     _anySetter.deserializeAndSet(p, ctxt, bean, propName);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
+                    throw wrapAndThrow(e, bean, propName, ctxt);
                 }
                 continue;
             }
@@ -692,8 +691,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
                     try {
                         builder = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
+                        throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                     }
                     if (builder.getClass() != _beanType.getRawClass()) {
                         return handlePolymorphic(p, ctxt, builder, tokens);
@@ -773,7 +771,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p,
                 try {
                     bean = prop.deserializeSetAndReturn(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -798,7 +796,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p,
                 try {
                     _anySetter.deserializeAndSet(p, ctxt, bean, propName);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
+                    throw wrapAndThrow(e, bean, propName, ctxt);
                 }
                 continue;
             } else {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java
@@ -145,7 +145,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
                 try {
                     builder = prop.deserializeSetAndReturn(p, ctxt, builder);
                 } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, builder, prop.getName(), ctxt);
                 }
             } else { // just skip?
                 p.skipChildren();
@@ -223,7 +223,7 @@ protected Object _deserializeNonVanilla(JsonParser p, DeserializationContext ctx
                     try {
                         prop.deserializeSetAndReturn(p, ctxt, builder);
                     } catch (Exception e) {
-                        wrapAndThrow(e, builder, prop.getName(), ctxt);
+                        throw wrapAndThrow(e, builder, prop.getName(), ctxt);
                     }
                     continue;
                 }
@@ -282,7 +282,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
                 try {
                     builder = prop.deserializeSetAndReturn(p, ctxt, builder);
                 } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, builder, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -295,8 +295,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
                     try {
                         builder = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
+                        throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                     }
                     //  polymorphic?
                     if (builder.getClass() != _beanType.getRawClass()) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java
@@ -212,7 +212,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
             } else { // just skip?
                 p.skipChildren();
@@ -268,7 +268,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
             } else { // just skip?
                 p.skipChildren();
@@ -339,7 +339,7 @@ protected Object _deserializeNonVanilla(JsonParser p, DeserializationContext ctx
                     try {
                         prop.deserializeAndSet(p, ctxt, bean);
                     } catch (Exception e) {
-                        wrapAndThrow(e, bean, prop.getName(), ctxt);
+                        throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                     }
                     continue;
                 }
@@ -398,7 +398,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
                 try {
                     prop.deserializeAndSet(p, ctxt, bean);
                 } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
+                    throw wrapAndThrow(e, bean, prop.getName(), ctxt);
                 }
                 continue;
             }
@@ -411,8 +411,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
                     try {
                         bean = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
+                        throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
                     p.setCurrentValue(bean);

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean`
`285`	`285`	`try {`
`286`	`286`	`prop.deserializeAndSet(p, ctxt, bean);`
`287`	`287`	`} catch (Exception e) {`
`288`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`288`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`289`	`289`	`}`
`290`	`290`	`ix = p.nextFieldName(_fieldMatcher);`
`291`	`291`	`}`
`@@ -396,7 +396,7 @@ private final Object _vanillaDeserialize(JsonParser p,`
`396`	`396`	`try {`
`397`	`397`	`prop.deserializeAndSet(p, ctxt, bean);`
`398`	`398`	`} catch (Exception e) {`
`399`		`- wrapAndThrow(e, bean, p.currentName(), ctxt);`
	`399`	`+ throw wrapAndThrow(e, bean, p.currentName(), ctxt);`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`// Elem #2`
`@@ -409,7 +409,7 @@ private final Object _vanillaDeserialize(JsonParser p,`
`409`	`409`	`try {`
`410`	`410`	`prop.deserializeAndSet(p, ctxt, bean);`
`411`	`411`	`} catch (Exception e) {`
`412`		`- wrapAndThrow(e, bean, p.currentName(), ctxt);`
	`412`	`+ throw wrapAndThrow(e, bean, p.currentName(), ctxt);`
`413`	`413`	`}`
`414`	`414`	`ix = p.nextFieldName(_fieldMatcher);`
`415`	`415`	`}`
`@@ -522,7 +522,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t`
`522`	`522`	`try {`
`523`	`523`	`_fieldsByIndex[ix].deserializeAndSet(p, ctxt, bean);`
`524`	`524`	`} catch (Exception e) {`
`525`		`- wrapAndThrow(e, bean, p.currentName(), ctxt);`
	`525`	`+ throw wrapAndThrow(e, bean, p.currentName(), ctxt);`
`526`	`526`	`}`
`527`	`527`	`continue;`
`528`	`528`	`}`
`@@ -630,7 +630,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri`
`630`	`630`	`try {`
`631`	`631`	`buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));`
`632`	`632`	`} catch (Exception e) {`
`633`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
	`633`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`634`	`634`	`}`
`635`	`635`	`continue;`
`636`	`636`	`}`
`@@ -687,9 +687,7 @@ protected final Object _deserializeWithErrorWrapping(JsonParser p,`
`687`	`687`	`try {`
`688`	`688`	`return prop.deserialize(p, ctxt);`
`689`	`689`	`} catch (Exception e) {`
`690`		`- wrapAndThrow(e, _beanType.getRawClass(), prop.getName(), ctxt);`
`691`		`- // never gets here, unless caller declines to throw an exception`
`692`		`- return null;`
	`690`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), prop.getName(), ctxt);`
`693`	`691`	`}`
`694`	`692`	`}`
`695`	`693`
`@@ -800,7 +798,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`800`	`798`	`try {`
`801`	`799`	`prop.deserializeAndSet(p, ctxt, bean);`
`802`	`800`	`} catch (Exception e) {`
`803`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`801`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`804`	`802`	`}`
`805`	`803`	`continue;`
`806`	`804`	`}`
`@@ -834,7 +832,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`834`	`832`	`try {`
`835`	`833`	`_anySetter.deserializeAndSet(b2.asParserOnFirstToken(), ctxt, bean, propName);`
`836`	`834`	`} catch (Exception e) {`
`837`		`- wrapAndThrow(e, bean, propName, ctxt);`
	`835`	`+ throw wrapAndThrow(e, bean, propName, ctxt);`
`838`	`836`	`}`
`839`	`837`	`}`
`840`	`838`	`tokens.writeEndObject();`
`@@ -865,7 +863,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`865`	`863`	`try {`
`866`	`864`	`prop.deserializeAndSet(p, ctxt, bean);`
`867`	`865`	`} catch (Exception e) {`
`868`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`866`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`869`	`867`	`}`
`870`	`868`	`continue;`
`871`	`869`	`}`
`@@ -897,9 +895,8 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`897`	`895`	`try {`
`898`	`896`	`_anySetter.deserializeAndSet(b2.asParserOnFirstToken(), ctxt, bean, propName);`
`899`	`897`	`} catch (Exception e) {`
`900`		`- wrapAndThrow(e, bean, propName, ctxt);`
	`898`	`+ throw wrapAndThrow(e, bean, propName, ctxt);`
`901`	`899`	`}`
`902`		`- continue;`
`903`	`900`	`}`
`904`	`901`	`}`
`905`	`902`	`tokens.writeEndObject();`
`@@ -991,9 +988,8 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri`
`991`	`988`	`buffer.bufferAnyProperty(_anySetter, propName,`
`992`	`989`	`_anySetter.deserialize(b2.asParserOnFirstToken(), ctxt));`
`993`	`990`	`} catch (Exception e) {`
`994`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
	`991`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`995`	`992`	`}`
`996`		`- continue;`
`997`	`993`	`}`
`998`	`994`	`}`
`999`	`995`
`@@ -1056,7 +1052,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont`
`1056`	`1052`	`try {`
`1057`	`1053`	`prop.deserializeAndSet(p, ctxt, bean);`
`1058`	`1054`	`} catch (Exception e) {`
`1059`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`1055`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`1060`	`1056`	`}`
`1061`	`1057`	`continue;`
`1062`	`1058`	`}`
`@@ -1082,7 +1078,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont`
`1082`	`1078`	`try {`
`1083`	`1079`	`_anySetter.deserializeAndSet(p, ctxt, bean, propName);`
`1084`	`1080`	`} catch (Exception e) {`
`1085`		`- wrapAndThrow(e, bean, propName, ctxt);`
	`1081`	`+ throw wrapAndThrow(e, bean, propName, ctxt);`
`1086`	`1082`	`}`
`1087`	`1083`	`continue;`
`1088`	`1084`	`}`
`@@ -1123,8 +1119,7 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D`
`1123`	`1119`	`try {`
`1124`	`1120`	`bean = creator.build(ctxt, buffer);`
`1125`	`1121`	`} catch (Exception e) {`
`1126`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`1127`		`- continue; // never gets here`
	`1122`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`1128`	`1123`	`}`
`1129`	`1124`	`// if so, need to copy all remaining tokens into buffer`
`1130`	`1125`	`while (t == JsonToken.FIELD_NAME) {`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ private final Object _vanillaDeserialize(JsonParser p, DeserializationContext ct`
`294`	`294`	`try {`
`295`	`295`	`builder = prop.deserializeSetAndReturn(p, ctxt, builder);`
`296`	`296`	`} catch (Exception e) {`
`297`		`- wrapAndThrow(e, builder, prop.getName(), ctxt);`
	`297`	`+ throw wrapAndThrow(e, builder, prop.getName(), ctxt);`
`298`	`298`	`}`
`299`	`299`	`continue;`
`300`	`300`	`}`
`@@ -343,7 +343,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt)`
`343`	`343`	`try {`
`344`	`344`	`bean = _fieldsByIndex[ix].deserializeSetAndReturn(p, ctxt, bean);`
`345`	`345`	`} catch (Exception e) {`
`346`		`- wrapAndThrow(e, bean, p.currentName(), ctxt);`
	`346`	`+ throw wrapAndThrow(e, bean, p.currentName(), ctxt);`
`347`	`347`	`}`
`348`	`348`	`continue;`
`349`	`349`	`}`
`@@ -399,8 +399,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`399`	`399`	`try {`
`400`	`400`	`builder = creator.build(ctxt, buffer);`
`401`	`401`	`} catch (Exception e) {`
`402`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`403`		`- continue; // never gets here`
	`402`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`404`	`403`	`}`
`405`	`404`	`// polymorphic?`
`406`	`405`	`if (builder.getClass() != _beanType.getRawClass()) {`
`@@ -496,7 +495,7 @@ protected final Object _deserialize(JsonParser p,`
`496`	`495`	`try {`
`497`	`496`	`builder = prop.deserializeSetAndReturn(p, ctxt, builder);`
`498`	`497`	`} catch (Exception e) {`
`499`		`- wrapAndThrow(e, builder, prop.getName(), ctxt);`
	`498`	`+ throw wrapAndThrow(e, builder, prop.getName(), ctxt);`
`500`	`499`	`}`
`501`	`500`	`continue;`
`502`	`501`	`}`
`@@ -532,7 +531,7 @@ protected final Object deserializeWithView(JsonParser p, DeserializationContext`
`532`	`531`	`try {`
`533`	`532`	`bean = prop.deserializeSetAndReturn(p, ctxt, bean);`
`534`	`533`	`} catch (Exception e) {`
`535`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`534`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`536`	`535`	`}`
`537`	`536`	`continue;`
`538`	`537`	`}`
`@@ -589,7 +588,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`589`	`588`	`try {`
`590`	`589`	`bean = prop.deserializeSetAndReturn(p, ctxt, bean);`
`591`	`590`	`} catch (Exception e) {`
`592`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`591`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`593`	`592`	`}`
`594`	`593`	`continue;`
`595`	`594`	`}`
`@@ -614,7 +613,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c`
`614`	`613`	`try {`
`615`	`614`	`_anySetter.deserializeAndSet(p, ctxt, bean, propName);`
`616`	`615`	`} catch (Exception e) {`
`617`		`- wrapAndThrow(e, bean, propName, ctxt);`
	`616`	`+ throw wrapAndThrow(e, bean, propName, ctxt);`
`618`	`617`	`}`
`619`	`618`	`continue;`
`620`	`619`	`}`
`@@ -692,8 +691,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,`
`692`	`691`	`try {`
`693`	`692`	`builder = creator.build(ctxt, buffer);`
`694`	`693`	`} catch (Exception e) {`
`695`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`696`		`- continue; // never gets here`
	`694`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`697`	`695`	`}`
`698`	`696`	`if (builder.getClass() != _beanType.getRawClass()) {`
`699`	`697`	`return handlePolymorphic(p, ctxt, builder, tokens);`
`@@ -773,7 +771,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p,`
`773`	`771`	`try {`
`774`	`772`	`bean = prop.deserializeSetAndReturn(p, ctxt, bean);`
`775`	`773`	`} catch (Exception e) {`
`776`		`- wrapAndThrow(e, bean, prop.getName(), ctxt);`
	`774`	`+ throw wrapAndThrow(e, bean, prop.getName(), ctxt);`
`777`	`775`	`}`
`778`	`776`	`continue;`
`779`	`777`	`}`
`@@ -798,7 +796,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p,`
`798`	`796`	`try {`
`799`	`797`	`_anySetter.deserializeAndSet(p, ctxt, bean, propName);`
`800`	`798`	`} catch (Exception e) {`
`801`		`- wrapAndThrow(e, bean, propName, ctxt);`
	`799`	`+ throw wrapAndThrow(e, bean, propName, ctxt);`
`802`	`800`	`}`
`803`	`801`	`continue;`
`804`	`802`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)`
`145`	`145`	`try {`
`146`	`146`	`builder = prop.deserializeSetAndReturn(p, ctxt, builder);`
`147`	`147`	`} catch (Exception e) {`
`148`		`- wrapAndThrow(e, builder, prop.getName(), ctxt);`
	`148`	`+ throw wrapAndThrow(e, builder, prop.getName(), ctxt);`
`149`	`149`	`}`
`150`	`150`	`} else { // just skip?`
`151`	`151`	`p.skipChildren();`
`@@ -223,7 +223,7 @@ protected Object _deserializeNonVanilla(JsonParser p, DeserializationContext ctx`
`223`	`223`	`try {`
`224`	`224`	`prop.deserializeSetAndReturn(p, ctxt, builder);`
`225`	`225`	`} catch (Exception e) {`
`226`		`- wrapAndThrow(e, builder, prop.getName(), ctxt);`
	`226`	`+ throw wrapAndThrow(e, builder, prop.getName(), ctxt);`
`227`	`227`	`}`
`228`	`228`	`continue;`
`229`	`229`	`}`
`@@ -282,7 +282,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`282`	`282`	`try {`
`283`	`283`	`builder = prop.deserializeSetAndReturn(p, ctxt, builder);`
`284`	`284`	`} catch (Exception e) {`
`285`		`- wrapAndThrow(e, builder, prop.getName(), ctxt);`
	`285`	`+ throw wrapAndThrow(e, builder, prop.getName(), ctxt);`
`286`	`286`	`}`
`287`	`287`	`continue;`
`288`	`288`	`}`
`@@ -295,8 +295,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`295`	`295`	`try {`
`296`	`296`	`builder = creator.build(ctxt, buffer);`
`297`	`297`	`} catch (Exception e) {`
`298`		`- wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`299`		`- continue; // never gets here`
	`298`	`+ throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);`
`300`	`299`	`}`
`301`	`300`	`// polymorphic?`
`302`	`301`	`if (builder.getClass() != _beanType.getRawClass()) {`