You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2004/09/02 04:43:14 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server AcknowledgementProcessor.java
jaliya 2004/09/01 19:43:14
Modified: sandesha/src/org/apache/sandesha/server
AcknowledgementProcessor.java
Log:
clean up the sendAcknowledgement(RMMessageContext rmMessageContext)
Revision Changes Path
1.5 +33 -38 ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java
Index: AcknowledgementProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AcknowledgementProcessor.java 20 Aug 2004 13:13:29 -0000 1.4
+++ AcknowledgementProcessor.java 2 Sep 2004 02:43:14 -0000 1.5
@@ -53,7 +53,7 @@
AcknowledgementRange ackRange = (AcknowledgementRange) ite.next();
long msgNumber = ackRange.getMinValue();
while (ackRange.getMaxValue() >= msgNumber) {
- storageManger.setAcknowledged(seqID,msgNumber);
+ storageManger.setAcknowledged(seqID, msgNumber);
//storageManager.setAcknowledged(String seqID,long msgNumber)
msgNumber++;
}
@@ -89,55 +89,50 @@
}
- SOAPEnvelope ackEnvelope = EnvelopeCreator.createAcknowledgementEnvelope(rmMessageContext, ackRangeVector);
+ SOAPEnvelope ackEnvelope =
+ EnvelopeCreator.createAcknowledgementEnvelope(rmMessageContext, ackRangeVector);
//Add the envelope to the response message of the messageContext.
//rmMessageContext.getMsgContext().setResponseMessage(new Message(ackEnvelope));
- rmMessageContext.setMessageType(Constants.MSG_TYPE_ACKNOWLEDGEMENT);
-
-
- ////////////////////////////////////////////////////////////////////////
- //////////////////////////////NEED TO CLEAN THIS PART///////////////////
-
- RMMessageContext rmMsgContext= new RMMessageContext();
- rmMsgContext.setAddressingHeaders(rmMessageContext.getAddressingHeaders());
- rmMsgContext.setMessageID(rmMessageContext.getMessageID());
- rmMsgContext.setObj(rmMessageContext.getObj());
- rmMsgContext.setReqEnv(rmMessageContext.getReqEnv());
- rmMsgContext.setResEnv(rmMessageContext.getResEnv());
- rmMsgContext.setRMHeaders(rmMessageContext.getRMHeaders());
- rmMsgContext.setSequenceID(rmMessageContext.getSequenceID());
- rmMsgContext.setOutGoingAddress(rmMessageContext.getOutGoingAddress());
-
- Message reqMsg= new Message(rmMessageContext.getMsgContext().getRequestMessage());
- MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
-
- msgContext = MessageContext.getCurrentContext();
- msgContext.setRequestMessage(reqMsg);
-
- rmMsgContext.setMsgContext(msgContext);
-
- msgContext.setResponseMessage(new Message(ackEnvelope));
- rmMsgContext.setOutGoingAddress(rmMessageContext.getAddressingHeaders().getFrom().getAddress().toString());
- rmMsgContext.setMessageType(Constants.MSG_TYPE_ACKNOWLEDGEMENT);
- rmMsgContext.setMsgContext(msgContext);
-
- ////////////////////////////////////////////////////////////////////////
-
+
+ RMMessageContext rmMsgContext = new RMMessageContext();
+ try {
+ //Create a new message using the ackEnvelope
+ Message resMsg = new Message(ackEnvelope);
+
+ //Create a new message context to store the ack message.
+ MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
+ //Copy the contents of the rmMessageContext to the rmMsgContext.
+ rmMessageContext.copyContents(rmMsgContext);
+ //Set the response message using the Ack message
+ msgContext.setResponseMessage(resMsg);
+ //Set the msgContext to the rmMsgContext
+ rmMsgContext.setMsgContext(msgContext);
+
+ //Get the from address to send the Ack.
+ rmMsgContext.setOutGoingAddress(
+ rmMessageContext.getAddressingHeaders().getFrom().getAddress().toString());
+ //Set the messsage type
+ rmMsgContext.setMessageType(Constants.MSG_TYPE_ACKNOWLEDGEMENT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ //TODO: Log the error
+ }
if ((rmMessageContext
.getAddressingHeaders()
.getFrom()
.getAddress()
.toString()
- .equals(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS))==true) {
+ .equals(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS))
+ == true) {
//Now we have synchronized ack.
- //rmMessageContext.getMsgContext().setResponseMessage(new Message(ackEnvelope));
+
+ //The original message context is used to send the ack asynchronously to the client.
+ //So the response message is replaced by the new ack message.
rmMessageContext.getMsgContext().setResponseMessage(new Message(ackEnvelope));
return true;
} else {
-
- ////////////////////////////////NEED TO CLEAN THIS PART///////////////////////////////////
-
+
//Store the asynchronize ack in the queue.
//The name for this queue is not yet fixed.
//RENAME insertAcknowledgement(rmMessageContext)