svn commit: r889796 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java

[dkulp]

Author: dkulp
Date: Fri Dec 11 20:24:14 2009
New Revision: 889796

URL: http://svn.apache.org/viewvc?rev=889796&view=rev
Log:
[CXF-1510] Only if it's not in a wrapper element

Modified:
    
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=889796&r1=889795&r2=889796&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 Fri Dec 11 20:24:14 2009
@@ -158,7 +158,8 @@
             }
         }
         if (clazz != null) {
-            if (clazz.getAnnotation(XmlRootElement.class) == null
+            if (!isFromWrapper 
+                && clazz.getAnnotation(XmlRootElement.class) == null
                 && clazz.getAnnotation(XmlType.class) != null
                 && 
StringUtils.isEmpty(clazz.getAnnotation(XmlType.class).name())) {
                 createTypeReference(part.getName(), clazz);