Fix #242

FasterXML · Sep 6, 2019 · a5f2eda · a5f2eda
1 parent 562c8cd
commit a5f2eda
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -31,6 +31,11 @@ Yury Vasyutinskiy (Falland@github)
 * Contributed #232: Implement `writeRawValue` in `ToXmlGenerator`
  (2.9.0)
 
+Victor Khovanskiy (khovanskiy@githib)
+
+* Reported #242: Deserialization of class inheritance depends on attributes order
+ (2.10.0)
+
 Nelson Dionisi (ndionisi@github)
 
 * Reported #333: `OutputDecorator` not called with `XmlMapper`

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -4,6 +4,11 @@ Project: jackson-dataformat-xml
 = Releases
 ------------------------------------------------------------------------
 
+2.10.0 (not yet released)
+
+#242: Deserialization of class inheritance depends on attributes order
+ (reported by Victor K)
+
 2.10.0.pr2 (31-Aug-2019)
 
 #351: XmlBeanSerializer serializes AnyGetters field even with FilterExceptFilter

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
@@ -4,6 +4,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.util.JsonParserDelegate;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.*;
 import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer;
@@ -136,11 +137,15 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
     /**********************************************************************
      */
 
+    @SuppressWarnings("resource")
     protected final void _configureParser(JsonParser p) throws IOException
     {
-        // 19-Aug-2013, tatu: Although we should not usually get called with
-        //   parser of other types, there are some cases where this may happen:
-        //   specifically, during structural value conversions.
+        // 05-Sep-2019, tatu: May get XML parser, except for case where content is
+        //   buffered. In that case we may still have access to real parser if we
+        //   are lucky (like in [dataformat-xml#242])
+        while (p instanceof JsonParserDelegate) {
+            p = ((JsonParserDelegate) p).delegate();
+        }
         if (p instanceof FromXmlParser) {
             ((FromXmlParser) p).addVirtualWrapping(_namesToWrap);
         }

diff --git a/...ml/failing/TypeAttributeOrder242Test.java → .../xml/deser/TypeAttributeOrder242Test.java b/...ml/failing/TypeAttributeOrder242Test.java → .../xml/deser/TypeAttributeOrder242Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.xml.failing;
+package com.fasterxml.jackson.dataformat.xml.deser;
 
 import java.util.List;