Change introspection call

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlSerializerProvider.java

@@ -63,7 +63,7 @@ public void serializeValue(JsonGenerator gen, Object value) throws IOException
         } else {
             QName rootName = _rootNameFromConfig();
             if (rootName == null) {
-                rootName = _rootNameLookup.findRootName(cls, _config);
+                rootName = _rootNameLookup.findRootName(this, cls);
             }
             _initWithRootName(xgen, rootName);
             asArray = TypeUtil.isIndexedType(cls);
@@ -102,7 +102,7 @@ public void serializeValue(JsonGenerator gen, Object value, JavaType rootType,
         } else {
             QName rootName = _rootNameFromConfig();
             if (rootName == null) {
-                rootName = _rootNameLookup.findRootName(rootType, _config);
+                rootName = _rootNameLookup.findRootName(this, rootType);
             }
             _initWithRootName(xgen, rootName);
             asArray = TypeUtil.isIndexedType(rootType);

src/main/java/com/fasterxml/jackson/dataformat/xml/util/XmlRootNameLookup.java

@@ -3,10 +3,10 @@
 import javax.xml.namespace.QName;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
 import com.fasterxml.jackson.databind.type.ClassKey;
 import com.fasterxml.jackson.databind.util.SimpleLookupCache;
+
 import com.fasterxml.jackson.dataformat.xml.XmlAnnotationIntrospector;
 
 /**
@@ -37,11 +37,11 @@ protected Object readResolve() {
         return this;
     }
 
-    public QName findRootName(JavaType rootType, MapperConfig<?> config) {
-        return findRootName(rootType.getRawClass(), config);
+    public QName findRootName(DatabindContext ctxt, JavaType rootType) {
+        return findRootName(ctxt, rootType.getRawClass());
     }
 
-    public QName findRootName(Class<?> rootType, MapperConfig<?> config)
+    public QName findRootName(DatabindContext ctxt, Class<?> rootType)
     {
         ClassKey key = new ClassKey(rootType);
         QName name;
@@ -51,19 +51,17 @@ public QName findRootName(Class<?> rootType, MapperConfig<?> config)
         if (name != null) {
             return name;
         }
-        name = _findRootName(rootType, config);
+        name = _findRootName(ctxt, rootType);
         synchronized (_rootNames) {
             _rootNames.put(key, name);
         }
         return name;
     }
-    
-    // NOTE: needed to be synchronized in 2.6.4, but 2.7.0 adds a proper fix
-    // for annotation introspection hence not needed any more
-    protected QName _findRootName(Class<?> rootType, MapperConfig<?> config)
+
+    protected QName _findRootName(DatabindContext ctxt, Class<?> rootType)
     {
-        final AnnotatedClass ac = config.introspectClassAnnotations(rootType);
-        final AnnotationIntrospector intr = config.getAnnotationIntrospector();
+        final AnnotatedClass ac = ctxt.introspectClassAnnotations(rootType);
+        final AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
         String localName = null;
         String ns = null;