You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/11/30 02:59:15 UTC

svn commit: r349860 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client: InOnlyMEPClient.java MEPClient.java

Author: hemapani
Date: Tue Nov 29 17:59:03 2005
New Revision: 349860

URL: http://svn.apache.org/viewcvs?rev=349860&view=rev
Log:
stop overriding message ID if it already present

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java?rev=349860&r1=349859&r2=349860&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java Tue Nov 29 17:59:03 2005
@@ -16,8 +16,9 @@
 
 package org.apache.axis2.client;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -29,15 +30,13 @@
 import org.apache.axis2.util.UUIDGenerator;
 import org.apache.wsdl.WSDLConstants;
 
-import javax.xml.namespace.QName;
-
 /**
  * This class handles In-Only (fire and forget) MEP
  */
 public class InOnlyMEPClient extends MEPClient {
     protected TransportOutDescription senderTransport;
 
-
+ 
     public InOnlyMEPClient(ServiceContext service) {
         super(service, WSDLConstants.MEP_URI_IN_ONLY);
     }
@@ -50,10 +49,12 @@
      */
     public void send(AxisOperation axisop, final MessageContext msgctx) throws AxisFault {
         prepareInvocation(axisop, msgctx);
-        String messageID = String.valueOf("uuid:"+ UUIDGenerator.getUUID());
-        msgctx.setMessageID(messageID);
+        if(msgctx.getMessageID() == null){
+            String messageID = String.valueOf("uuid:"+ UUIDGenerator.getUUID());
+            msgctx.setMessageID(messageID);
+        }
         msgctx.setServiceContext(serviceContext);
-        ConfigurationContext syscontext = serviceContext.getConfigurationContext();
+
 
         //if the transport to use for sending is not specified, try to find it from the URL
         if (senderTransport == null) {
@@ -64,7 +65,6 @@
 
         //initialize and set the Operation Context
         ConfigurationContext sysContext = serviceContext.getConfigurationContext();
-        AxisConfiguration registry = sysContext.getAxisConfiguration();
         msgctx.setOperationContext(axisop.findOperationContext(msgctx, serviceContext));
 
         AxisEngine engine = new AxisEngine(sysContext);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=349860&r1=349859&r2=349860&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Tue Nov 29 17:59:03 2005
@@ -349,7 +349,7 @@
      *
      * @throws org.apache.axis2.AxisFault
      */
-    protected void assumeServiceContext(String clientHome)
+    protected  void assumeServiceContext(String clientHome)
             throws AxisFault {
         ConfigurationContext configurationContext =
                 new ConfigurationContextFactory().buildClientConfigurationContext(clientHome);