Author: jaliya
Date: Fri Sep 15 21:54:19 2006
New Revision: 446820
URL: http://svn.apache.org/viewvc?view=rev&rev=446820
Log:
Fixed a redundant code.
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java?view=diff&rev=446820&r1=446819&r2=446820
==============================================================================
---
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
(original)
+++
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
Fri Sep 15 21:54:19 2006
@@ -146,8 +146,8 @@
} else {
if (rmMsgCtx.getAcksTo() != null)
acksTo = new AcksTo(new Address(new
URI(rmMsgCtx.getAcksTo())));
- // else if (rmMsgCtx.getReplyTo() != null)
- // acksTo = new AcksTo(new Address(new
URI(rmMsgCtx.getReplyTo())));
+ // else if (rmMsgCtx.getReplyTo() != null)
+ // acksTo = new AcksTo(new Address(new
URI(rmMsgCtx.getReplyTo())));
else if (rmMsgCtx.getSourceURL() != null)
acksTo = new AcksTo(new Address(new
URI(rmMsgCtx.getSourceURL())));
}
@@ -169,23 +169,32 @@
throws Exception {
RMMessageContext terSeqRMMsgContext = new RMMessageContext();
-
+
MessageContext terSeqMsgContext = new
MessageContext(rmMsgCtx.getMsgContext().getAxisEngine());
-
+
//change to set SOAP constants to terminate seq message.
SOAPConstants SOAPConst = rmMsgCtx.getMsgContext().getSOAPConstants();
- if (SOAPConst!=null)
+ if (SOAPConst != null)
terSeqMsgContext.setSOAPConstants(SOAPConst);
-
+
terSeqRMMsgContext.setSequenceID(rmMsgCtx.getSequenceID());
AddressingHeaders addHeaders =
getAddressingHeadersForTerminateSequence(rmMsgCtx, endPoint);
- SOAPEnvelope soe = new
SOAPEnvelope(rmMsgCtx.getMsgContext().getSOAPConstants());
- addHeaders.toEnvelope(soe);
- AddressingHeaders terSqAddrHeaders = new AddressingHeaders(soe);
- terSqAddrHeaders.setAction(new Action(new
URI(Constants.WSRM.ACTION_TERMINATE_SEQUENCE)));
- terSeqRMMsgContext.setAddressingHeaders(terSqAddrHeaders);
+ //Following lines have been copied from the first version of Sandesha
and somehow
+ //been carried into this version. At that time I remember there was
some requirement to do this.
+ //Now it is not required but cannot remember why it was required at
the first place.
+ //So just leaving it commented. - Jaliya
+
+ //SOAPEnvelope soe = new
SOAPEnvelope(rmMsgCtx.getMsgContext().getSOAPConstants());
+ //addHeaders.toEnvelope(soe);
+ //AddressingHeaders terSqAddrHeaders = new AddressingHeaders(soe);
+ //terSqAddrHeaders.setAction(new Action(new
URI(Constants.WSRM.ACTION_TERMINATE_SEQUENCE)));
+ //terSeqRMMsgContext.setAddressingHeaders(terSqAddrHeaders);
+
+ addHeaders.setAction(new Action(new
URI(Constants.WSRM.ACTION_TERMINATE_SEQUENCE)));
+ terSeqRMMsgContext.setAddressingHeaders(addHeaders);
+
terSeqRMMsgContext.setOutGoingAddress(rmMsgCtx.getOutGoingAddress());
terSeqRMMsgContext.setMsgContext(terSeqMsgContext);
terSeqRMMsgContext.setMessageType(Constants.MSG_TYPE_TERMINATE_SEQUENCE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
