jaliya 2005/01/11 05:50:49
Modified: sandesha/src/org/apache/sandesha/client
ClientStorageManager.java RMSender.java
Log:
Added the functionality to send the TerminateSeq message from the Client
Revision Changes Path
1.15 +5 -12
ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ClientStorageManager.java 11 Jan 2005 07:15:04 -0000 1.14
+++ ClientStorageManager.java 11 Jan 2005 13:50:49 -0000 1.15
@@ -174,7 +174,6 @@
msg = accessor.getNextOutgoingMsgContextToSend();
if(msg==null){
-
msg = accessor.getNextLowPriorityMessageContextToSend(); //
checks whether all the request messages hv been acked
}
return msg;
@@ -296,12 +295,10 @@
String messageId = relatesTo.getURI().toString();
//CHANGE THIS. SEARCH FOR THE SEQ USING MESID
//String sequenceId = rmMessageContext.getSequenceID();
- System.out.println("******** SEARCH FOR THIS MSG ID "+messageId);
-
+
String sequenceId = null;
sequenceId = accessor.searchForSequenceId(messageId);
-
- System.out.println("******** SEARCH OBTAINED SEQ ID IS :
"+sequenceId);
+
boolean exists = accessor.isIncomingSequenceExists(sequenceId);
if (!exists) {
@@ -388,13 +385,9 @@
// TODO Auto-generated method stub
}
-
-
-
-
-
- public void setAckReceived(RMMessageContext responseMsg) {
- accessor.setAckReceived(responseMsg);
+
+ public void setAckReceived(String seqId,long msgNo) {
+ accessor.setAckReceived(seqId,msgNo);
}
}
1.17 +7 -24
ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RMSender.java 10 Jan 2005 22:59:31 -0000 1.16
+++ RMSender.java 11 Jan 2005 13:50:49 -0000 1.17
@@ -92,6 +92,10 @@
addrHeaders, requestMesssageContext.getSync());
}
+ if(requestMesssageContext.isLastMessage()){
+
storageManager.insertTerminateSeqMessage(getTerminateSeqMessage(requestMesssageContext));
+ }
+
if (requestMesssageContext.isHasResponse() &&
!requestMesssageContext.getSync()) {
RMMessageContext responseMessageContext = null;
while (responseMessageContext == null) {
@@ -117,25 +121,7 @@
//SEND TERMINATE SEQ
}
- if(requestMesssageContext.isLastMessage()){
-//
while(!storageManager.isAckComplete(requestMesssageContext.getSequenceID())){
-//
Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
-// }
-// if(requestMesssageContext.getSync()){
-//
while(!storageManager.isResponseComplete(requestMesssageContext.getSequenceID())){
-//
Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
-// }
-// }
-
storageManager.insertTerminateSeqMessage(getTerminateSeqMessage(requestMesssageContext));
-
-
-// if(storageManager.isAllSequenceComplete()){
-// senderThread.stop();
-// sas.stop();
-// }
- }
-
-
+
} catch (Exception ex) {
ex.printStackTrace();
@@ -149,14 +135,11 @@
private RMMessageContext getTerminateSeqMessage(RMMessageContext
rmMessageContext) {
RMMessageContext terSeqRMMsgContext = new RMMessageContext();
MessageContext terSeqMsgContext = new
MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
+ terSeqRMMsgContext.setSequenceID(rmMessageContext.getSequenceID());
+
terSeqRMMsgContext.setAddressingHeaders(rmMessageContext.getAddressingHeaders());
//RMMessageContext.copyMessageContext(msgContext, messageContext);
terSeqRMMsgContext.setOutGoingAddress(rmMessageContext.getOutGoingAddress());
- SOAPEnvelope
terSeqEnv=EnvelopeCreator.createTerminatSeqMessage(rmMessageContext);
- Message terSeqMsg= new Message(terSeqEnv);
-
- terSeqMsgContext.setRequestMessage(terSeqMsg);
terSeqRMMsgContext.setMsgContext(terSeqMsgContext);
-
terSeqRMMsgContext.setMessageType(Constants.MSG_TYPE_TERMINATE_SEQUENCE);
// TODO Auto-generated method stub
return terSeqRMMsgContext;
