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 ch...@apache.org on 2006/04/26 08:33:33 UTC
svn commit: r397107 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: SandeshaModule.java
storage/inmemory/InMemorySenderBeanMgr.java
Author: chamikara
Date: Tue Apr 25 23:33:32 2006
New Revision: 397107
URL: http://svn.apache.org/viewcvs?rev=397107&view=rev
Log:
Updated the InMemory storage impl to send the messages in order, if possible
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java?rev=397107&r1=397106&r2=397107&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java Tue Apr 25 23:33:32 2006
@@ -99,7 +99,6 @@
// shutdown the module
public void shutdown(AxisConfiguration axisSystem) throws AxisFault {
-
}
// Removing data of uncontinuuable sequences so that the sandesha2 system
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=397107&r1=397106&r2=397107&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java Tue Apr 25 23:33:32 2006
@@ -131,30 +131,28 @@
}
public synchronized SenderBean getNextMsgToSend() {
-// ArrayList beans = new ArrayList();
Iterator iterator = table.keySet().iterator();
-// long lowestAppMsgNo = 0;
-// while (iterator.hasNext()) {
-// Object key = iterator.next();
-// temp = (SenderBean) table.get(key);
-//
-// if (temp.isSend()) {
-// long timeToSend = temp.getTimeToSend();
-// long timeNow = System.currentTimeMillis();
-// if ((timeNow >= timeToSend)) {
-// if (temp.getMessageType()==Sandesha2Constants.MessageTypes.APPLICATION) {
-// long msgNo = temp.getMessageNumber();
-// if (lowestAppMsgNo==0) {
-// lowestAppMsgNo=msgNo;
-// }else {
-// if (msgNo<lowestAppMsgNo)
-// lowestAppMsgNo = msgNo;
-// }
-// }
-// }
-// }
-// }
+ long lowestAppMsgNo = 0;
+ while (iterator.hasNext()) {
+ Object key = iterator.next();
+ SenderBean temp = (SenderBean) table.get(key);
+ if (temp.isSend()) {
+ long timeToSend = temp.getTimeToSend();
+ long timeNow = System.currentTimeMillis();
+ if ((timeNow >= timeToSend)) {
+ if (temp.getMessageType()==Sandesha2Constants.MessageTypes.APPLICATION) {
+ long msgNo = temp.getMessageNumber();
+ if (lowestAppMsgNo==0) {
+ lowestAppMsgNo=msgNo;
+ }else {
+ if (msgNo<lowestAppMsgNo)
+ lowestAppMsgNo = msgNo;
+ }
+ }
+ }
+ }
+ }
iterator = table.keySet().iterator();
while (iterator.hasNext()) {
@@ -166,50 +164,28 @@
long timeToSend = temp.getTimeToSend();
long timeNow = System.currentTimeMillis();
if ((timeNow >= timeToSend)) {
-// if (temp.getMessageType()==Sandesha2Constants.MessageTypes.APPLICATION) {
-// if (temp.getMessageNumber()==lowestAppMsgNo)
-// beans.add(temp);
-// }else {
-// beans.add(temp);
-// }
- updateNextSendingTime (temp);
- return temp;
+ boolean valid = false;
+ if (temp.getMessageType()==Sandesha2Constants.MessageTypes.APPLICATION) {
+ if (temp.getMessageNumber()==lowestAppMsgNo)
+ valid = true;
+ }else {
+ valid = true;
+ }
+
+ if (valid) {
+ updateNextSendingTime (temp);
+ return temp;
+ }
}
}
}
return null;
-
-//
-// return beans;
}
private void updateNextSendingTime (SenderBean bean) {
}
-
-// public synchronized Collection findMsgsToSend() {
-// ArrayList beans = new ArrayList();
-// Iterator iterator = table.keySet().iterator();
-//
-// SenderBean temp;
-//
-// while (iterator.hasNext()) {
-// Object key = iterator.next();
-// temp = (SenderBean) table.get(key);
-//
-// if (temp.isSend()) {
-//
-// long timeToSend = temp.getTimeToSend();
-// long timeNow = System.currentTimeMillis();
-// if ((timeNow >= timeToSend)) {
-// beans.add(temp);
-// }
-// }
-// }
-//
-// return beans;
-// }
private synchronized ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
ArrayList beans = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org