Author: mlovett
Date: Fri Feb  2 02:17:55 2007
New Revision: 502565

URL: http://svn.apache.org/viewvc?view=rev&rev=502565
Log:
Ensure we always find the correct namespace for MessagePending headers

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?view=diff&rev=502565&r1=502564&r2=502565
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
 Fri Feb  2 02:17:55 2007
@@ -119,10 +119,9 @@
                        throw new SandeshaException (message);
                }
                
-               RMMsgContext returnRMMsg = 
MsgInitializer.initializeMessage(returnMessage);
-               
-               if(pending) addMessagePendingHeader (returnRMMsg,pending);
+               if(pending) addMessagePendingHeader(returnMessage, 
makeConnection.getNamespaceValue());
                
+               RMMsgContext returnRMMsg = 
MsgInitializer.initializeMessage(returnMessage);
                setTransportProperties (returnMessage, rmMsgCtx);
                
                // Link the response to the request
@@ -144,13 +143,10 @@
                return false;
        }
        
-       private void addMessagePendingHeader (RMMsgContext returnMessage, 
boolean pending) throws SandeshaException {
-               String rmNamespace = returnMessage.getRMNamespaceValue();
-               MessagePending messagePending = new MessagePending 
(rmNamespace);
-               messagePending.setPending(pending);
-               
-               messagePending.toSOAPEnvelope(returnMessage.getSOAPEnvelope());
-               
+       private void addMessagePendingHeader (MessageContext returnMessage, 
String namespace) throws SandeshaException {
+               MessagePending messagePending = new MessagePending(namespace);
+               messagePending.setPending(true);
+               messagePending.toSOAPEnvelope(returnMessage.getEnvelope());
        }
 
        public boolean processOutMessage(RMMsgContext rmMsgCtx) throws 
AxisFault {



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

Reply via email to