[jbossws-commits] JBossWS SVN: r11624 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-02-19 04:46:20 -0500 (Fri, 19 Feb 2010)
New Revision: 11624

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
Log:
[JBWS-2938] fixing JAXB based dispatch to return proper value instead of JAXBElement

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java	2010-02-19 09:44:52 UTC (rev 11623)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java	2010-02-19 09:46:20 UTC (rev 11624)
@@ -26,6 +26,7 @@
 import java.io.StringReader;
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.soap.MessageFactory;
@@ -181,6 +182,10 @@
                log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false));
             Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
             retObj = unmarshaller.unmarshal(soapElement);
+            if (retObj instanceof JAXBElement<?>)
+            {
+               retObj = ((JAXBElement<?>)retObj).getValue();
+            }
          }
       }
       catch (RuntimeException rte)