Merge branch '2.6'

Conflicts:
	pom.xml

Author: cowtowncoder

pom.xml

@@ -25,7 +25,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
   </scm>
   <properties>
     <version.jackson.annotations>2.7.0-rc1</version.jackson.annotations>
-    <version.jackson.core>2.7.0-rc1</version.jackson.core>
+    <version.jackson.core>2.7.0-rc2-SNAPSHOT</version.jackson.core>
     <version.jackson.jaxb>${version.jackson.core}</version.jackson.jaxb>
     <packageVersion.dir>com/fasterxml/jackson/dataformat/xml</packageVersion.dir>
     <packageVersion.package>${project.groupId}.xml</packageVersion.package>

release-notes/CREDITS

@@ -20,3 +20,8 @@ Dan Jasek: (oillio@github)
 
 * Contributed #126: Allow specifying properties that should be written as CData
  (2.5.0)
+
+Leo Wang (wanglingsong@github)
+
+* Reported #171: `@JacksonXmlRootElement` malfunction in multi-thread environment
+ (2.6.4)

release-notes/VERSION

@@ -10,6 +10,8 @@ Project: jackson-dataformat-xml
 
 2.6.4 (not yet released)
 
+#171: `@JacksonXmlRootElement` malfunction in multi-thread environment
+ (reported by Leo W)
 #172: XML INDENT_OUTPUT property fails to add newline/indent initial elements
  (reported by rpatrick00@github)
 

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

@@ -51,7 +51,17 @@ public QName findRootName(Class<?> rootType, MapperConfig<?> config)
         if (name != null) {
             return name;
         }
-
+        name = _findRootName(rootType, config);
+        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)
+    {
         BeanDescription beanDesc = config.introspectClassAnnotations(rootType);
         AnnotationIntrospector intr = config.getAnnotationIntrospector();
         AnnotatedClass ac = beanDesc.getClassInfo();
@@ -68,21 +78,16 @@ public QName findRootName(Class<?> rootType, MapperConfig<?> config)
             // Should we strip out enclosing class tho? For now, nope:
             // one caveat: array simple names end with "[]"; also, "$" needs replacing
             localName = StaxUtil.sanitizeXmlTypeName(rootType.getSimpleName());
-            name = new QName("", localName);
-        } else {
-            // Otherwise let's see if there's namespace, too (if we are missing it)
-            if (ns == null || ns.length() == 0) {
-                ns = findNamespace(intr, ac);
-            }
+            return new QName("", localName);
+        }
+        // Otherwise let's see if there's namespace, too (if we are missing it)
+        if (ns == null || ns.length() == 0) {
+            ns = findNamespace(intr, ac);
         }
         if (ns == null) { // some QName impls barf on nulls...
             ns = "";
         }
-        name = new QName(ns, localName);
-        synchronized (_rootNames) {
-            _rootNames.put(key, name);
-        }
-        return name;
+        return new QName(ns, localName);
     }
 
     private String findNamespace(AnnotationIntrospector ai, AnnotatedClass ann)

src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java

@@ -23,7 +23,7 @@ static class Simple
         public String text = "something";
     }
 
-    // [Issue#24]
+    // [dataformat-xml#24]
 
     static class Main {
         @JsonProperty("com.test.stack") public Stack stack;
@@ -56,7 +56,7 @@ static class JAXBStyle
         public String value;
     }
 
-    // [Issue#66]
+    // [dataformat-xml#66]
     static class Issue66Bean
     {
         @JacksonXmlProperty(isAttribute = true)
@@ -66,7 +66,7 @@ static class Issue66Bean
         protected String textValue;
     }
 
-    // [Issue#72]
+    // [dataformat-xml#72]
 
     static class TextOnlyBean
     {
@@ -130,7 +130,7 @@ public void testIssue24() throws Exception
         assertEquals(TEXT, main.stack.slot.value);
     }
 
-    // for [Issue#36]
+    // for [dataformat-xml#36]
     public void testAlternateTextElementName() throws IOException
     {
         final String XML = "<JAXBStyle>foo</JAXBStyle>";
@@ -148,7 +148,7 @@ public void testAlternateTextElementName() throws IOException
         assertEquals("foo", pojo.value);
     }
 
-    // [Issue#66], implicit property from "XmlText"
+    // [dataformat-xml#66], implicit property from "XmlText"
     public void testIssue66() throws Exception
     {
         JacksonXmlModule module = new JacksonXmlModule();
@@ -166,7 +166,7 @@ public void testIssue66() throws Exception
         assertEquals(XML, json);
     }
 
-    // [Issue#72]
+    // [dataformat-xml#72]
     public void testTextOnlyPojo() throws Exception
     {
         XmlMapper mapper = xmlMapper(true);