svn commit: r529264 - in /webservices/axis2/trunk/java/modules/jaxws: src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java

[ngallardo]

Author: ngallardo
Date: Mon Apr 16 07:29:23 2007
New Revision: 529264

URL: http://svn.apache.org/viewvc?view=rev&rev=529264
Log:
Fixing some issues with getting/setting JAXB payloads.

Modified:
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
    
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java?view=diff&rev=529264&r1=529263&r2=529264
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
 Mon Apr 16 07:29:23 2007
@@ -27,6 +27,7 @@
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
 import org.apache.axis2.jaxws.message.factory.SourceBlockFactory;
@@ -56,7 +57,8 @@
      */
     public Object getPayload(JAXBContext context) {
         BlockFactory factory = (JAXBBlockFactory) 
FactoryRegistry.getFactory(JAXBBlockFactory.class);
-        Object payload = _getPayload(context, factory);
+        JAXBBlockContext jbc = new JAXBBlockContext(context);
+        Object payload = _getPayload(jbc, factory);
         return payload;
     }
     
@@ -86,7 +88,8 @@
      */
     public void setPayload(Object obj, JAXBContext context) {
         BlockFactory factory = (JAXBBlockFactory) 
FactoryRegistry.getFactory(JAXBBlockFactory.class);
-        _setPayload(obj, context, factory);
+        JAXBBlockContext jbc = new JAXBBlockContext(context);
+        _setPayload(obj, jbc, factory);
     }
 
     /*

Modified: 
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java?view=diff&rev=529264&r1=529263&r2=529264
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java
 Mon Apr 16 07:29:23 2007
@@ -99,7 +99,12 @@
         JAXBContext jbc = JAXBContext.newInstance("test");
         
         Object obj = msg.getPayload(jbc);
-        //assertTrue("The returned payload (Object) was null", obj != null);
+        assertTrue("The returned payload (Object) was null", obj != null);
+        assertTrue("The returned payload (Object) was of the wrong type: " + 
obj.getClass().getName(), obj.getClass().equals(EchoString.class));
+       
+        EchoString echo = (EchoString) obj;
+        assertTrue("The EchoString object had null input", echo.getInput() != 
null);
+        assertTrue("The EchoString object had bad input: " + echo.getInput(), 
echo.getInput().equals(INPUT));
     }
     
     private MessageContext createSampleMessageContext() throws Exception {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]