Minor protection against nulls; triggered by databind

cowtowncoder · cowtowncoder · commit f406e23f5e15 · 2022-05-29T19:34:22.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/WrapperHandlingDeserializer.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/WrapperHandlingDeserializer.java
@@ -154,7 +154,7 @@ protected final void _configureParser(JsonParser p) throws IOException
         while (p instanceof JsonParserDelegate) {
             p = ((JsonParserDelegate) p).delegate();
         }
-        if (p instanceof FromXmlParser) {
+        if ((p instanceof FromXmlParser) && (_namesToWrap != null)) {
             // 03-May-2021, tatu: as per [dataformat-xml#469] there are special
             //   cases where we get String token to represent XML empty element.
             //   If so, need to refrain from adding wrapping as that would

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected final void _configureParser(JsonParser p) throws IOException`
`154`	`154`	`while (p instanceof JsonParserDelegate) {`
`155`	`155`	`p = ((JsonParserDelegate) p).delegate();`
`156`	`156`	`}`
`157`		`- if (p instanceof FromXmlParser) {`
	`157`	`+ if ((p instanceof FromXmlParser) && (_namesToWrap != null)) {`
`158`	`158`	`// 03-May-2021, tatu: as per [dataformat-xml#469] there are special`
`159`	`159`	`// cases where we get String token to represent XML empty element.`
`160`	`160`	`// If so, need to refrain from adding wrapping as that would`