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/12/02 14:18:18 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server/queue SequenceHash.java ServerQueue.java ResponseSequenceHash.java
jaliya 2004/12/02 05:18:18
Modified: sandesha/src/org/apache/sandesha/server/dao
ServerQueueDAO.java ServerDatabaseDAO.java
IServerDAO.java
sandesha/src/org/apache/sandesha/server/queue
SequenceHash.java ServerQueue.java
ResponseSequenceHash.java
Log:
Added a new method; searchForSequenceId(messageID) to search in the queue to get the sequenceID for a given messageID
Revision Changes Path
1.8 +7 -2 ws-fx/sandesha/src/org/apache/sandesha/server/dao/ServerQueueDAO.java
Index: ServerQueueDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/dao/ServerQueueDAO.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerQueueDAO.java 1 Dec 2004 04:21:38 -0000 1.7
+++ ServerQueueDAO.java 2 Dec 2004 13:18:18 -0000 1.8
@@ -86,8 +86,7 @@
boolean result = false;
try {
ServerQueue sq = ServerQueue.getInstance();
- sq
- .addMessageToIncomingSequence(sequenceId, msgNo,
+ sq.addMessageToIncomingSequence(sequenceId, msgNo,
rmMessageContext);
result = true;
} catch (QueueException e) {
@@ -373,5 +372,11 @@
boolean p = sq.isRequestMsgPresent(sequenceId,msgId);
return p;
+ }
+
+ public String searchForSequenceId(String messageId) {
+ ServerQueue sq = ServerQueue.getInstance();
+ String seqId = sq.searchForSequenceId(messageId);
+ return seqId;
}
}
1.8 +4 -0 ws-fx/sandesha/src/org/apache/sandesha/server/dao/ServerDatabaseDAO.java
Index: ServerDatabaseDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/dao/ServerDatabaseDAO.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerDatabaseDAO.java 1 Dec 2004 04:21:38 -0000 1.7
+++ ServerDatabaseDAO.java 2 Dec 2004 13:18:18 -0000 1.8
@@ -261,4 +261,8 @@
// TODO Auto-generated method stub
return false;
}
+
+ public String searchForSequenceId(String messageId){
+ return null;
+ }
}
1.8 +2 -0 ws-fx/sandesha/src/org/apache/sandesha/server/dao/IServerDAO.java
Index: IServerDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/dao/IServerDAO.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IServerDAO.java 1 Dec 2004 04:21:38 -0000 1.7
+++ IServerDAO.java 2 Dec 2004 13:18:18 -0000 1.8
@@ -79,4 +79,6 @@
public boolean isRequestMessagePresent(String sequenceId,String msgId);
+ public String searchForSequenceId(String messageId);
+
}
1.5 +13 -0 ws-fx/sandesha/src/org/apache/sandesha/server/queue/SequenceHash.java
Index: SequenceHash.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/queue/SequenceHash.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SequenceHash.java 1 Dec 2004 04:21:38 -0000 1.4
+++ SequenceHash.java 2 Dec 2004 13:18:18 -0000 1.5
@@ -228,4 +228,17 @@
b = hash.containsKey(msgId);
return b;
}
+
+ public boolean hasMessageWithId(String msgId){
+ //boolean b = false;
+
+ Iterator it = hash.keySet().iterator();
+
+ while(it.hasNext()){
+ RMMessageContext msg = (RMMessageContext) it.next();
+ if(msg.getMessageID().equals(msgId))
+ return true;
+ }
+ return false;
+ }
}
1.8 +22 -3 ws-fx/sandesha/src/org/apache/sandesha/server/queue/ServerQueue.java
Index: ServerQueue.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/queue/ServerQueue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerQueue.java 1 Dec 2004 04:21:38 -0000 1.7
+++ ServerQueue.java 2 Dec 2004 13:18:18 -0000 1.8
@@ -181,7 +181,7 @@
synchronized (sh) {
if (sh == null)
- throw new QueueException("Sequence id doen not exist");
+ throw new QueueException("Sequence id does not exist");
if (!sh.hasProcessableMessages())
return null;
@@ -635,7 +635,7 @@
public RMMessageContext checkForResponseMessage(String requestId,String seqId){
SequenceHash sh = (SequenceHash) incomingMap.get(seqId);
- //System.out.println("DEFAULT : "+seqId + " SEQ "+seqId);
+ System.out.println("DEFAULT : "+requestId + " SEQ "+seqId);
if (sh == null) {
System.out.println("ERROR: SEQ IS NULL");
@@ -651,7 +651,7 @@
public boolean isRequestMsgPresent(String seqId,String messageId){
System.out.println("******************* "+messageId);
ResponseSequenceHash rsh = (ResponseSequenceHash) outgoingMap.get(seqId);
-
+
if (rsh == null) {
System.out.println("ERROR: SEQ IS NULL");
return false;
@@ -664,6 +664,25 @@
return present;
+ }
+
+ public String searchForSequenceId(String messageId){
+ Iterator it = outgoingMap.keySet().iterator();
+
+ String key =null;
+ while(it.hasNext()){
+ key = (String) it.next();
+ Object obj=outgoingMap.get(key);
+ if(obj!=null){
+ ResponseSequenceHash hash = (ResponseSequenceHash)obj;
+ boolean hasMsg = hash.hasMessageWithId(messageId);
+ if(!hasMsg)
+ key=null;
+ }
+
+ }
+
+ return key;
}
}
1.7 +13 -0 ws-fx/sandesha/src/org/apache/sandesha/server/queue/ResponseSequenceHash.java
Index: ResponseSequenceHash.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/queue/ResponseSequenceHash.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResponseSequenceHash.java 1 Dec 2004 04:21:38 -0000 1.6
+++ ResponseSequenceHash.java 2 Dec 2004 13:18:18 -0000 1.7
@@ -260,4 +260,17 @@
b = hash.containsKey(msgId);
return b;
}
+
+ public boolean hasMessageWithId(String msgId){
+ //boolean b = false;
+
+ Iterator it = hash.keySet().iterator();
+ while(it.hasNext()){
+ RMMessageContext msg = (RMMessageContext) it.next();
+ if(msg.getMessageID().equals(msgId))
+ return true;
+ }
+ return false;
+ }
+
}