Author: gatfora
Date: Thu Feb 15 02:53:47 2007
New Revision: 507885
URL: http://svn.apache.org/viewvc?view=rev&rev=507885
Log:
Set flags correctly on RMSBean to prevent early termination of sequences
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=507885&r1=507884&r2=507885
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Thu Feb 15 02:53:47 2007
@@ -26,10 +26,8 @@
import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=507885&r1=507884&r2=507885
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
Thu Feb 15 02:53:47 2007
@@ -135,6 +135,7 @@
private static final int TIMED_OUT_FLAG = 0x00100000;
private static final int SEQ_CLOSED_CLIENT_FLAG = 0x01000000;
private static final int ACKED_MESSAGES_FLAG = 0x10000000;
+ private static final int TERM_PAUSER_FOR_CS = 0x00000002;
/**
* In WSRM Anon URI scenario, we may not want to terminate a perticular
sequence until the CreateSequence has been received
@@ -305,6 +306,7 @@
public void setTerminationPauserForCS(boolean terminationPauserForCS) {
this.terminationPauserForCS = terminationPauserForCS;
+ this.rmsFlags |= TERM_PAUSER_FOR_CS;
}
@@ -321,6 +323,7 @@
result.append("\nHighestOutRelatesTo:
");result.append(highestOutRelatesTo);
result.append("\nNextMessageNumber: ");
result.append(nextMessageNumber);
result.append("\nTerminateAdded : ");
result.append(terminateAdded);
+ result.append("\nTerminatePauser : ");
result.append(terminationPauserForCS);
result.append("\nTimedOut : "); result.append(timedOut);
result.append("\nClosedClient : ");
result.append(sequenceClosedClient);
result.append("\nNumAckedMsgs : ");
result.append(numberOfMessagesAcked);
@@ -396,6 +399,9 @@
match = false;
else if((bean.rmsFlags & ACKED_MESSAGES_FLAG) != 0 &&
bean.getNumberOfMessagesAcked() != this.getNumberOfMessagesAcked())
+ match = false;
+
+ else if((bean.rmsFlags & TERM_PAUSER_FOR_CS) != 0 &&
bean.isTerminationPauserForCS() != this.isTerminationPauserForCS())
match = false;
return match;
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=507885&r1=507884&r2=507885
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
Thu Feb 15 02:53:47 2007
@@ -239,7 +239,7 @@
}
// start the in listner for the client side, if acksTo
is not anonymous.
- if (acksToEPR != null &&
acksToEPR.hasAnonymousAddress()) {
+ if (acksToEPR != null &&
!acksToEPR.hasAnonymousAddress()) {
String transportInProtocol =
firstAplicationMsgCtx.getOptions().getTransportInProtocol();
if (transportInProtocol == null) {
throw new
SandeshaException(SandeshaMessageHelper
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=507885&r1=507884&r2=507885
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Thu Feb 15 02:53:47 2007
@@ -61,7 +61,7 @@
public static void checkAndTerminate(RMMsgContext relatedMessage,
StorageManager storageManager, RMSBean rmsBean)
throws SandeshaStorageException, AxisFault {
- if(log.isDebugEnabled()) log.debug("Entry:
TerminateManager::checkAndTerminate");
+ if(log.isDebugEnabled()) log.debug("Enter:
TerminateManager::checkAndTerminate " +rmsBean);
long lastOutMessage = rmsBean.getLastOutMessage ();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
