chamikara 2005/05/14 10:21:10
Modified: sandesha/src/org/apache/sandesha RMInitiator.java
sandesha/src/org/apache/sandesha/client
ClientStorageManager.java
sandesha/src/org/apache/sandesha/storage/queue
SandeshaQueue.java
Log:
Used the clean method in ClientStorageManager to clean the queue when the
client ends
Revision Changes Path
1.16 +3 -7 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RMInitiator.java 13 May 2005 11:54:01 -0000 1.15
+++ RMInitiator.java 14 May 2005 17:21:10 -0000 1.16
@@ -119,18 +119,14 @@
if (listenerStarted) {
sas.stop();
-
-
- //FOR JSP
+
listenerStarted = false;
- //END JSP
listenerStarted = false;
}
sender.setRunning(false);
-
- //FOR JSP
senderStarted = false;
- //END JSP
+
+ storageManager.clearStorage();
return new RMStatus();
1.35 +1 -0
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ClientStorageManager.java 14 May 2005 06:52:31 -0000 1.34
+++ ClientStorageManager.java 14 May 2005 17:21:10 -0000 1.35
@@ -222,6 +222,7 @@
if (0 >= messageNumber)
return;
Long msgNo = new Long(messageNumber);
+
accessor.addMessageToIncomingSequence(sequenceId, msgNo,
rmMessageContext);
}
1.19 +9 -4
ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
Index: SandeshaQueue.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SandeshaQueue.java 11 May 2005 13:04:27 -0000 1.18
+++ SandeshaQueue.java 14 May 2005 17:21:10 -0000 1.19
@@ -90,10 +90,12 @@
public boolean addMessageToIncomingSequence(String seqId, Long messageNo,
RMMessageContext msgCon)
throws QueueException {
boolean successful = false;
-
+
if (seqId == null || msgCon == null)
throw new QueueException(Constants.Queue.ADD_ERROR);
+
+
if (isIncomingSequenceExists(seqId)) {
IncomingSequence seqHash = (IncomingSequence)
incomingMap.get(seqId);
@@ -361,12 +363,15 @@
}
public void clear(boolean yes) {
+
if (!yes)
return;
+
incomingMap.clear();
highPriorityQueue.clear();
outgoingMap.clear();
queueBin.clear();
+
}
public void removeAllMsgsFromIncomingSeqence(String seqId, boolean yes) {
@@ -648,9 +653,9 @@
if (!hasMsg)
key = null;
-// if(hasMsg){
-// break;
-// }
+ if(hasMsg){
+ return key;
+ }
}
}
