You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by mc...@apache.org on 2008/07/31 18:01:40 UTC
svn commit: r681403 - in
/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers:
Sender.java SequenceEntry.java
Author: mckierna
Date: Thu Jul 31 09:01:38 2008
New Revision: 681403
URL: http://svn.apache.org/viewvc?rev=681403&view=rev
Log:
See https://issues.apache.org/jira/browse/SANDESHA2-173, thanks Sara
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SequenceEntry.java
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?rev=681403&r1=681402&r2=681403&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Thu Jul 31 09:01:38 2008
@@ -156,10 +156,18 @@
// Check that the sequence is still valid
boolean found = false;
if (entry.isRmSource()) {
- RMSBean matcher = new RMSBean();
- matcher.setInternalSequenceID(sequenceId);
- matcher.setTerminated(false);
- RMSBean rms = storageManager.getRMSBeanMgr().findUnique(matcher);
+ RMSBean rms = null;
+ if (entry.rmsKey == null) {
+ RMSBean matcher = new RMSBean();
+ matcher.setInternalSequenceID(sequenceId);
+ matcher.setTerminated(false);
+ rms = storageManager.getRMSBeanMgr().findUnique(matcher);
+ if (rms != null) {
+ entry.rmsKey = rms.getCreateSeqMsgID();
+ }
+ } else {
+ rms = storageManager.getRMSBeanMgr().retrieve(entry.rmsKey);
+ }
if (rms != null && !rms.isTerminated() && !rms.isTimedOut()) {
sequenceId = rms.getSequenceID();
if (SequenceManager.hasSequenceTimedOut(rms, sequenceId, storageManager))
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SequenceEntry.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SequenceEntry.java?rev=681403&r1=681402&r2=681403&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SequenceEntry.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SequenceEntry.java Thu Jul 31 09:01:38 2008
@@ -26,6 +26,8 @@
private String sequenceId;
private boolean rmSource;
+
+ public String rmsKey;
public SequenceEntry(String sequenceId, boolean rmSource) {
this.sequenceId = sequenceId;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org