Merge branch '3.x' into feature/record-with-jacksonxmltext

Author: cowtowncoder

src/main/java/tools/jackson/dataformat/xml/deser/XmlDeserializationContext.java

@@ -10,6 +10,7 @@
 import tools.jackson.databind.deser.DeserializationContextExt;
 import tools.jackson.databind.deser.DeserializerCache;
 import tools.jackson.databind.deser.DeserializerFactory;
+import tools.jackson.dataformat.xml.XmlFactory;
 
 /**
  * XML-specific {@link DeserializationContext} needed to override certain
@@ -18,12 +19,15 @@
 public class XmlDeserializationContext
     extends DeserializationContextExt
 {
+    private final String _xmlTextElementName;
+
     public XmlDeserializationContext(TokenStreamFactory tsf,
             DeserializerFactory deserializerFactory, DeserializerCache cache,
             DeserializationConfig config, FormatSchema schema,
             InjectableValues values) {
         super(tsf, deserializerFactory, cache,
                 config, schema, values);
+        _xmlTextElementName = ((XmlFactory) tsf).getXMLTextElementName();
     }
 
     /*
@@ -63,12 +67,12 @@ public String extractScalarFromObject(JsonParser p, ValueDeserializer<?> deser,
             // Couple of ways to find "real" textual content. One is to look for
             // "XmlText"... but for that would need to know configuration. Alternatively
             // could hold on to last text seen -- but this might be last attribute, for
-            // empty element. So for now let's simply hard-code check for empty String
-            // as marker and hope for best
+            // empty element. So for now let's simply hard-code check for expected
+            // "text element" marker/placeholder and hope for best
             final String propName = p.currentName();
             JsonToken t = p.nextToken();
             if (t == JsonToken.VALUE_STRING) {
-                if (FromXmlParser.DEFAULT_TEXT_PROPERTY.equals(propName)) {
+                if (propName.equals(_xmlTextElementName)) {
                     text = p.getString();
                 }
             } else {