[jboss-svn-commits] JBossWS SVN: r627 - branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb

[jboss-svn-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2006-07-24 06:50:04 -0400 (Mon, 24 Jul 2006)
New Revision: 627

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java
Log:
FIX JBWS-1091

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java	2006-07-22 19:29:00 UTC (rev 626)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java	2006-07-24 10:50:04 UTC (rev 627)
@@ -111,11 +111,22 @@
                {
                   JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i];
                   VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings();
+
                   if (variableMappings != null)
                   {
                      String clsName = javaXmlMapping.getJavaType();
                      Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader());
+                     QName clsQName = javaXmlMapping.getRootTypeQName();
 
+                     if (clsQName != null)
+                     {
+                        // TODO: legacy API usage, see JBWS-1091
+                        if ("complexType".equalsIgnoreCase(javaXmlMapping.getQnameScope()))
+                        {
+                           delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart());
+                        }
+                     }
+
                      for (int j = 0; j < variableMappings.length; ++j)
                      {
                         VariableMapping variableMapping = variableMappings[j];