You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by bo...@apache.org on 2007/05/02 20:39:58 UTC

svn commit: r534585 - in /incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2: ODEService.java util/SoapMessageConverter.java

Author: boisvert
Date: Wed May  2 11:39:57 2007
New Revision: 534585

URL: http://svn.apache.org/viewvc?view=rev&rev=534585
Log:
Don't recreate the envelope if already created

Modified:
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java

Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?view=diff&rev=534585&r1=534584&r2=534585
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Wed May  2 11:39:57 2007
@@ -179,8 +179,7 @@
                     }
                     try {
                         // Refreshing the message exchange
-                        odeMex = (MyRoleMessageExchange) _server.getEngine()
-                                .getMessageExchange(odeMex.getMessageExchangeId());
+                        odeMex = (MyRoleMessageExchange) _server.getEngine().getMessageExchange(odeMex.getMessageExchangeId());
                         onResponse(odeMex, outMsgContext);
                         commit = true;
                     } catch (AxisFault af) {

Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?view=diff&rev=534585&r1=534584&r2=534585
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java Wed May  2 11:39:57 2007
@@ -159,8 +159,11 @@
         if (bi == null)
             throw new OdeFault(__msgs.msgBindingInputNotFound(_serviceName, _portName, op.getName()));
 
-        SOAPEnvelope soapEnv = _soapFactory.createSOAPEnvelope();
+        SOAPEnvelope soapEnv = msgCtx.getEnvelope();
+        if (soapEnv == null) {
+            _soapFactory.getDefaultEnvelope();
         msgCtx.setEnvelope(soapEnv);
+        }
         
         List<SOAPHeader> soapHeaders = getSOAPHeaders(bi);
         for (SOAPHeader sh : soapHeaders)
@@ -193,7 +196,11 @@
         if (bo == null)
             throw new OdeFault(__msgs.msgBindingOutputNotFound(_serviceName, _portName, op.getName()));
 
-        SOAPEnvelope soapEnv = _soapFactory.createSOAPEnvelope();
+        SOAPEnvelope soapEnv = msgCtx.getEnvelope();
+        if (soapEnv == null) {
+            _soapFactory.getDefaultEnvelope();
+            msgCtx.setEnvelope(soapEnv);
+        }
         List<SOAPHeader> soapHeaders = getSOAPHeaders(bo);
         for (SOAPHeader sh : soapHeaders)
             createSoapHeader(soapEnv, sh, op.getOutput().getMessage(), message);