You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ja...@apache.org on 2006/06/29 15:39:58 UTC

svn commit: r418046 - in /webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha: server/SenderWorker.java ws/rm/Identifier.java

Author: jaliya
Date: Thu Jun 29 06:39:58 2006
New Revision: 418046

URL: http://svn.apache.org/viewvc?rev=418046&view=rev
Log:
fixed a bug in org.apache.sandesha.ws.rm.Identifier.java. 

Modified:
    webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
    webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/ws/rm/Identifier.java

Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java?rev=418046&r1=418045&r2=418046&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java Thu Jun 29 06:39:58 2006
@@ -322,6 +322,7 @@
         call.setTargetEndpointAddress(rmMessageContext.getOutGoingAddress());
         call.setSOAPVersion(rmMessageContext.getMsgContext().getSOAPConstants());
 
+
         call.setClientHandlers(requestChain, responseChain);
         if (rmMessageContext.getMsgContext().getRequestMessage() != null) {
             String soapMsg = rmMessageContext.getMsgContext().getRequestMessage()
@@ -330,6 +331,9 @@
             if (rmMessageContext.getAddressingHeaders().getAction() != null) {
                 call.setSOAPActionURI(rmMessageContext.getAddressingHeaders().getAction().toString());
             }
+            call.setProperty(org.apache.axis.message.addressing.Constants.ENV_ADDRESSING_REQUEST_HEADERS,
+            rmMessageContext.getAddressingHeaders());
+
         }
         return call;
     }

Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/ws/rm/Identifier.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/ws/rm/Identifier.java?rev=418046&r1=418045&r2=418046&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/ws/rm/Identifier.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/ws/rm/Identifier.java Thu Jun 29 06:39:58 2006
@@ -7,6 +7,7 @@
 
 import javax.xml.soap.SOAPException;
 import java.util.Iterator;
+import java.util.ArrayList;
 
 /**
  * class Identifier
@@ -142,12 +143,21 @@
     private void removeIdentifierElementIfAny(MessageElement msgElement) {
 
         Iterator ite = msgElement.getChildElements();
+        ArrayList lst=new ArrayList();
+
         while (ite.hasNext()) {
             MessageElement childElement = (MessageElement) ite.next();
             if (Constants.WSRM.IDENTIFIER.equals(childElement.getName()) &&
                     (Constants.WSRM.NS_URI_RM.equals(childElement.getNamespaceURI()))) {
-                childElement.detachNode();
+                //childElement.detachNode();
+                lst.add(childElement);
             }
+        }
+
+        Iterator iterator=lst.iterator();
+        while(iterator.hasNext()){
+            MessageElement element=(MessageElement)iterator.next();
+            element.detachNode();
         }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org