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 ch...@apache.org on 2005/12/11 04:40:10 UTC

svn commit: r355888 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java core/src/org/apache/axis2/Constants.java core/src/org/apache/axis2/client/MEPClient.java

Author: chinthaka
Date: Sat Dec 10 19:40:05 2005
New Revision: 355888

URL: http://svn.apache.org/viewcvs?rev=355888&view=rev
Log:
extracting the useSeparateListener variable from the Options to message context.

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=355888&r1=355887&r2=355888&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Sat Dec 10 19:40:05 2005
@@ -43,7 +43,7 @@
             return;
         }
 
-        ArrayList addressingHeaders = null;
+        ArrayList addressingHeaders;
         try {
             addressingHeaders = header.getHeaderBlocksWithNSURI(Submission.WSA_NAMESPACE);
             if (addressingHeaders != null) {
@@ -160,9 +160,9 @@
         Iterator addressingHeadersIt = addressingHeaders.iterator();
         while (addressingHeadersIt.hasNext()) {
             SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) addressingHeadersIt.next();
-            EndpointReference epr = null;
+            EndpointReference epr;
             if (AddressingConstants.WSA_TO.equals(soapHeaderBlock.getLocalName())) {
-                //here the addressing epr overidde what ever already there is 
+                //here the addressing epr overidde what ever already there in the message context
                 epr = new EndpointReference(soapHeaderBlock.getText());
                 messageInformationHeaders.setTo(epr);
 
@@ -173,7 +173,8 @@
             } else if (AddressingConstants.WSA_FROM.equals(soapHeaderBlock.getLocalName())) {
                 epr = messageInformationHeaders.getFrom();
                 if (epr == null) {
-                    epr = new EndpointReference("");
+                    epr = new EndpointReference("");  // I don't know the address now. Let me pass the empty string now and fill this
+                                                      // once I process the Elements under this. 
                     messageInformationHeaders.setFrom(epr);
                 }
                 extractEPRInformation(soapHeaderBlock, epr, addressingNamespace);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=355888&r1=355887&r2=355888&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Sat Dec 10 19:40:05 2005
@@ -210,6 +210,8 @@
 
         // we need to some times send the message as multipart/related, even if there is no MTOM stuff in the envelope.
         public static final String FORCE_MIME = "ForceMimeBoundary";
+
+        public static final String IS_USING_SEPARATE_LISTENER = "IsUsingSeparateListener";
     }
 
     public static final String VALUE_TRUE = "true";

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=355888&r1=355887&r2=355888&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 Sat Dec 10 19:40:05 2005
@@ -17,6 +17,7 @@
 package org.apache.axis2.client;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
@@ -123,6 +124,7 @@
         msgCtx.setWSAAction(clientOptions.getAction());
 
         msgCtx.setSoapAction(clientOptions.getSoapAction());
+        msgCtx.setProperty(Constants.Configuration.IS_USING_SEPARATE_LISTENER, new Boolean(clientOptions.isUseSeparateListener()));
 
         // I'm not setting the properties here. Those will be set, when we create the operation context