jaliya 2005/05/20 03:16:02
Modified: sandesha/src/org/apache/sandesha RMInitiator.java
sandesha/src/org/apache/sandesha/client
ClientPropertyValidator.java RMSender.java
Log:
Change the RMInitiator to handle two senders client sender and server sender
Revision Changes Path
1.20 +24 -21 ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java
Index: RMInitiator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RMInitiator.java 19 May 2005 04:08:02 -0000 1.19
+++ RMInitiator.java 20 May 2005 10:16:01 -0000 1.20
@@ -48,41 +48,44 @@
public class RMInitiator {
private static boolean rmInvokerStarted = false;
- private static boolean senderStarted = false;
+ private static boolean cleintSenderStarted = false;
+ private static boolean serverSenderStarted = false;
private static boolean listenerStarted = false;
private static SimpleAxisServer sas = null;
- private static Thread thSender;
+ private static Thread thCleintSender;
+ private static Thread thServerSender;
private static Thread thInvoker;
- private static Sender sender;
+ private static Sender cleintSender;
+ private static Sender serverSender;
private static final Log log =
LogFactory.getLog(RMInitiator.class.getName());
public static IStorageManager init(boolean client) {
if (client) {
IStorageManager storageManager = new ClientStorageManager();
- if (!senderStarted) {
+ if (!cleintSenderStarted) {
System.out.println(Constants.InfomationMessage.SENDER_STARTED);
- sender = new Sender(storageManager);
+ cleintSender = new Sender(storageManager);
SimpleChain reqChain = getRequestChain();
SimpleChain resChain = getResponseChain();
if (reqChain != null)
- sender.setRequestChain(reqChain);
+ cleintSender.setRequestChain(reqChain);
if (resChain != null)
- sender.setResponseChain(resChain);
+ cleintSender.setResponseChain(resChain);
- thSender = new Thread(sender);
- thSender.setDaemon(false);
- senderStarted = true;
- thSender.start();
+ thCleintSender = new Thread(cleintSender);
+ thCleintSender.setDaemon(false);
+ cleintSenderStarted = true;
+ thCleintSender.start();
}
return storageManager;
} else {
- if (!senderStarted) {
+ if (!serverSenderStarted) {
System.out.println(Constants.InfomationMessage.SENDER_STARTED);
- Sender sender = new Sender();
- Thread thSender = new Thread(sender);
- thSender.setDaemon(false);
- senderStarted = true;
- thSender.start();
+ serverSender = new Sender();
+ thServerSender = new Thread(serverSender);
+ thServerSender.setDaemon(false);
+ serverSenderStarted = true;
+ thServerSender.start();
}
if (!rmInvokerStarted) {
System.out.println(Constants.InfomationMessage.RMINVOKER_STARTED);
@@ -135,8 +138,8 @@
sas.stop();
listenerStarted = false;
}
- sender.setRunning(false);
- senderStarted = false;
+ cleintSender.setRunning(false);
+ cleintSenderStarted = false;
storageManager.clearStorage();
return new RMStatus();
@@ -152,10 +155,10 @@
//END JSP
listenerStarted = false;
}
- sender.setRunning(false);
+ cleintSender.setRunning(false);
//FOR JSP
- senderStarted = false;
+ cleintSenderStarted = false;
//END JSP
throw new AxisFault("Inactivity Timeout Reached, No Response from
the Server");
}
1.25 +2 -1
ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
Index: ClientPropertyValidator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ClientPropertyValidator.java 19 May 2005 10:27:47 -0000 1.24
+++ ClientPropertyValidator.java 20 May 2005 10:16:02 -0000 1.25
@@ -193,7 +193,8 @@
return errorMsg;
}
- if ((msgNumber == 0) || (action == null)) {
+// if ((msgNumber == 0) || (action == null)) {
+ if ((action == null)) {
errorMsg = Constants.ErrorMessages.MESSAGE_NUMBER_NOT_SPECIFIED;
return errorMsg;
}
1.44 +5 -0
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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- RMSender.java 19 May 2005 08:34:09 -0000 1.43
+++ RMSender.java 20 May 2005 10:16:02 -0000 1.44
@@ -55,6 +55,7 @@
private IStorageManager storageManager;
private static final Log log =
LogFactory.getLog(RMSender.class.getName());
private static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
+ private static int messageNumber=0;
/**
* This is the main method that is invoked by the axis engine. This
method will add the reqest
@@ -76,6 +77,10 @@
String tempSeqID = reqMsgCtx.getSequenceID();
long msgNo = reqMsgCtx.getMsgNumber();
+ if(msgNo==0){
+ msgNo=++messageNumber;
+ reqMsgCtx.setMsgNumber(msgNo);
+ }
if (msgNo == 1) {
reqMsgCtx = processFirstRequestMessage(reqMsgCtx,
reqMsgCtx.getSync());
