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 ml...@apache.org on 2007/01/25 17:30:48 UTC
svn commit: r499832 -
/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
Author: mlovett
Date: Thu Jan 25 08:30:47 2007
New Revision: 499832
URL: http://svn.apache.org/viewvc?view=rev&rev=499832
Log:
Search for non-terminated sequences, and set the internal sequence id when possible
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=499832&r1=499831&r2=499832
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java Thu Jan 25 08:30:47 2007
@@ -102,6 +102,7 @@
RMSBeanMgr rmsBeanManager = storageManager.getRMSBeanMgr();
RMSBean findRMS = new RMSBean();
findRMS.setPollingMode(true);
+ findRMS.setTerminated(false);
List results = rmsBeanManager.find(findRMS);
int size = results.size();
@@ -129,6 +130,7 @@
RMDBean findBean = new RMDBean();
findBean.setPollingMode(true);
+ findBean.setTerminated(false);
findBean.setSequenceID(sequenceId); // Note that this may be null
List results = nextMsgMgr.find(findBean);
@@ -148,16 +150,13 @@
if(log.isDebugEnabled()) log.debug("Exit: PollingManager::pollRMDSide");
}
- private void pollForSequence(String sequenceId, String sequencePropertyKey, String referenceMsgKey, RMSequenceBean rmBean) throws SandeshaException, SandeshaStorageException, AxisFault {
+ private void pollForSequence(String sequenceId,
+ String sequencePropertyKey,
+ String referenceMsgKey,
+ RMSequenceBean rmBean)
+ throws SandeshaException, SandeshaStorageException, AxisFault
+ {
if(log.isDebugEnabled()) log.debug("Enter: PollingManager::pollForSequence, " + sequenceId + ", " + sequencePropertyKey + ", " + referenceMsgKey + ", " + rmBean);
-
- // Don't poll for a terminated sequence
- // TODO once the 'terminated' flag is a property on the RMS / RMD bean, we should
- // be able to filter out terminated sequences before we get here.
- if(rmBean.isTerminated()) {
- if(log.isDebugEnabled()) log.debug("Exit: PollingManager::pollForSequence, already terminated");
- return;
- }
//create a MakeConnection message
String replyTo = rmBean.getReplyToEPR();
@@ -183,7 +182,7 @@
//add an entry for the MakeConnection message to the sender (with ,send=true, resend=false)
SenderBean makeConnectionSenderBean = new SenderBean ();
-// makeConnectionSenderBean.setInternalSequenceID(internalSequenceId);
+ makeConnectionSenderBean.setInternalSequenceID((rmBean instanceof RMSBean) ? sequencePropertyKey : null); // We only have internal ids for the RMS-side
makeConnectionSenderBean.setMessageContextRefKey(makeConnectionMsgStoreKey);
makeConnectionSenderBean.setMessageID(makeConnectionRMMessage.getMessageId());
makeConnectionSenderBean.setMessageType(Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org