Author: gatfora
Date: Thu Dec  7 04:21:25 2006
New Revision: 483430

URL: http://svn.apache.org/viewvc?view=rev&rev=483430
Log:
Applying patch for SANDESHA2-49 to ensure outsequence id is always found

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
 Thu Dec  7 04:21:25 2006
@@ -267,8 +267,6 @@
 
                String ACKS_TO_EPR = "acksToEPR";
 
-               String OUT_SEQUENCE_ID = "OutSequenceId";
-
                String INTERNAL_SEQUENCE_ID = "TempSequenceId";
 
                String REPLY_TO_EPR = "ReplyToEPR";

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
 Thu Dec  7 04:21:25 2006
@@ -636,16 +636,14 @@
                }
 
                StorageManager storageManager = 
SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
-               SequencePropertyBeanMgr seqPropMgr = 
storageManager.getSequencePropertyBeanMgr();
 
                // Get a transaction to retrieve the properties
                Transaction transaction = storageManager.getTransaction();
-               SequencePropertyBean sequenceIDBean = null;
+               String sequenceID = null;
                
                try
                {                       
-                       sequenceIDBean = seqPropMgr.retrieve(internalSequenceID,
-                                       
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);         
+                       sequenceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceID, 
storageManager);              
                }
                finally
                {
@@ -653,11 +651,10 @@
                        transaction.commit();
                }
                
-               if (sequenceIDBean == null)
+               if (sequenceID == null)
                        throw new 
SandeshaException(SandeshaMessageHelper.getMessage(
                                        
SandeshaMessageKeys.sequenceIdBeanNotSet));
 
-               String sequenceID = sequenceIDBean.getValue();
                return sequenceID;
        }
        
@@ -689,24 +686,18 @@
                // Get a transaction to obtain sequence information
                Transaction transaction = storageManager.getTransaction();
                
-               SequencePropertyBean sequenceIDBean = null;
+               String sequenceID = null;
                
                try
                {
-                       SequencePropertyBeanMgr seqPropMgr = 
storageManager.getSequencePropertyBeanMgr();
-                       sequenceIDBean = seqPropMgr.retrieve(internalSequenceID,
-                                       
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
+                       sequenceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceID, 
storageManager);
                }
                finally
                {
                        transaction.commit();
                }
                
-               String sequenceID = null;
-               
-               if (sequenceIDBean != null)
-                       sequenceID = sequenceIDBean.getValue();
-               else
+               if (sequenceID == null)
                        sequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;       
                
                String rmSpecVersion = (String) 
options.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
@@ -852,10 +843,6 @@
                        }
                }
        }
-       
-       private static String getInternalSequenceID(String to, String 
sequenceKey) {
-               return SandeshaUtil.getInternalSequenceID(to, sequenceKey);
-       }
 
        private static SOAPEnvelope configureCloseSequence(Options options, 
ConfigurationContext configurationContext)
                        throws SandeshaException {
@@ -885,25 +872,19 @@
                // Get a transaction for getting the sequence properties
                Transaction transaction = storageManager.getTransaction();
 
-               SequencePropertyBean sequenceIDBean = null;
+               String sequenceID = null;
                
                try
                {
-                       SequencePropertyBeanMgr seqPropMgr = 
storageManager.getSequencePropertyBeanMgr();
-                       sequenceIDBean = seqPropMgr.retrieve(internalSequenceID,
-                                       
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
+                       sequenceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceID, 
storageManager);
                }
                finally
                {
                        transaction.commit();
                }
                
-               String sequenceID = null;
-
-               if (sequenceIDBean != null)
-                       sequenceID = sequenceIDBean.getValue();
-               else
-                       sequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;
+               if (sequenceID == null)
+                       sequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;       
 
                String rmSpecVersion = (String) 
options.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
 
@@ -1181,24 +1162,18 @@
                // Get a transaction to obtain sequence information
                Transaction transaction = storageManager.getTransaction();
                
-               SequencePropertyBean sequenceIDBean = null;
+               String sequenceID = null;
                
                try
                {
-                       SequencePropertyBeanMgr seqPropMgr = 
storageManager.getSequencePropertyBeanMgr();
-                       sequenceIDBean = seqPropMgr.retrieve(internalSequenceID,
-                                       
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
+                       sequenceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceID, 
storageManager);
                }
                finally
                {
                        transaction.commit();
                }
                
-               String sequenceID = null;
-               
-               if (sequenceIDBean != null)
-                       sequenceID = sequenceIDBean.getValue();
-               else
+               if (sequenceID == null)
                        sequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;       
                
                String rmSpecVersion = (String) 
options.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
@@ -1481,7 +1456,7 @@
                String to = toEPR.getAddress();
                String sequenceKey = (String) 
options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
 
-               String internalSequenceID = getInternalSequenceID(to, 
sequenceKey);
+               String internalSequenceID = 
SandeshaUtil.getInternalSequenceID(to, sequenceKey);
 
                return internalSequenceID;
        }

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 Thu Dec  7 04:21:25 2006
@@ -25,9 +25,8 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.RMMsgContext;
@@ -78,7 +77,7 @@
                this.inboundSequence = inboundSequenceId;
        }
        
-       public boolean processInMessage(RMMsgContext rmMsgCtx) throws AxisFault 
{
+       public boolean processInMessage(RMMsgContext rmMsgCtx) {
                if (log.isDebugEnabled()) {
                        log.debug("Enter: 
ApplicationMsgProcessor::processInMessage");
                        log.debug("Exit: 
ApplicationMsgProcessor::processInMessage");
@@ -256,8 +255,7 @@
 
                boolean sendCreateSequence = false;
 
-               SequencePropertyBean outSeqBean = 
seqPropMgr.retrieve(sequencePropertyKey,
-                               
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
+               String outSequenceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceId, 
storageManager);
 
                // setting async ack endpoint for the server side. (if present)
                if (serverSide) {
@@ -277,7 +275,7 @@
                        MessageContext requestMessageContext;
                        try {
                                requestMessageContext = 
msgContext.getOperationContext().getMessageContext(
-                                               
AxisOperationFactory.MESSAGE_LABEL_IN_VALUE);
+                                               
WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                        } catch (AxisFault e) {
                                throw new SandeshaException(e);
                        }
@@ -315,7 +313,7 @@
                                                                                
                                                                        // v1_1.
 
                if (messageNumber == 1) {
-                       if (outSeqBean == null) { // out sequence will be set 
for the
+                       if (outSequenceID == null) { // out sequence will be 
set for the
                                                                                
// server side, in the case of an offer.
                                sendCreateSequence = true; // message number 
being one and not
                                                                                
        // having an out sequence, implies
@@ -355,7 +353,7 @@
                                        MessageContext requestMessage;
                                        try {
                                                requestMessage = 
operationContext
-                                                               
.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+                                                               
.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                                        } catch (AxisFault e) {
                                                throw new SandeshaException(e);
                                        }
@@ -394,7 +392,7 @@
 //                                                     
.getServerSideIncomingSeqIdFromInternalSeqId(internalSequenceId);
                                        
                                        try {
-                                               MessageContext 
requestMsgContext = 
operationContext.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+                                               MessageContext 
requestMsgContext = 
operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                                                RMMsgContext 
requestRMMsgContext = MsgInitializer.initializeMessage(requestMsgContext);
                                                
                                                String 
requestSideSequencePropertyKey = 
SandeshaUtil.getSequencePropertyKey(requestRMMsgContext);
@@ -446,7 +444,7 @@
                        MessageContext reqMsgCtx = null;
                        try {
                                reqMsgCtx = 
msgContext.getOperationContext().getMessageContext(
-                                               
OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+                                               
WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                        } catch (AxisFault e) {
                                throw new SandeshaException(e);
                        }
@@ -475,7 +473,7 @@
 
                // processing the response if not an dummy.
                if (!dummyMessage)
-                       processResponseMessage(rmMsgCtx, internalSequenceId, 
messageNumber, storageKey, storageManager);
+                       processResponseMessage(rmMsgCtx, internalSequenceId, 
outSequenceID, messageNumber, storageKey, storageManager);
 
                
                //Users wont be able to get reliable response msgs in the back 
channel in the back channel of a 
@@ -598,10 +596,10 @@
                        log.debug("Exit: 
ApplicationMsgProcessor::addCreateSequenceMessage");
        }
 
-       private void processResponseMessage(RMMsgContext rmMsg, String 
internalSequenceId, long messageNumber,
+       private void processResponseMessage(RMMsgContext rmMsg, String 
internalSequenceId, String outSequenceID, long messageNumber,
                        String storageKey, StorageManager storageManager) 
throws AxisFault {
                if (log.isDebugEnabled())
-                       log.debug("Enter: 
ApplicationMsgProcessor::processResponseMessage, " + internalSequenceId);
+                       log.debug("Enter: 
ApplicationMsgProcessor::processResponseMessage, " + internalSequenceId + ", " 
+ outSequenceID);
 
                MessageContext msg = rmMsg.getMessageContext();
 
@@ -613,10 +611,6 @@
                SequencePropertyBean replyToBean = 
sequencePropertyMgr.retrieve(internalSequenceId,
                                
Sandesha2Constants.SequenceProperties.REPLY_TO_EPR);
 
-               // again - looks weird in the client side - but consistent
-               SequencePropertyBean outSequenceBean = 
sequencePropertyMgr.retrieve(internalSequenceId,
-                               
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
-
                if (toBean == null) {
                        String message = 
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
                        log.debug(message);
@@ -640,7 +634,7 @@
                if (msg.isServerSide()) {
 
                        MessageContext requestMsg = 
msg.getOperationContext().getMessageContext(
-                                       
OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+                                       WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                        if (requestMsg != null) {
                                newToStr = requestMsg.getReplyTo().getAddress();
                        }
@@ -671,7 +665,7 @@
                        MessageContext requestMsg = null;
 
                        requestMsg = msg.getOperationContext()
-                                       
.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+                                       
.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
 
                        RMMsgContext reqRMMsgCtx = 
MsgInitializer.initializeMessage(requestMsg);
                        Sequence requestSequence = (Sequence) 
reqRMMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
@@ -713,15 +707,15 @@
                // addAckRequested = true; //TODO decide the policy to add the
                // ackRequested tag
 
-               // setting the Sequnece id.
+               // setting the Sequence id.
                // Set send = true/false depending on the availability of the 
out
                // sequence id.
                String identifierStr = null;
-               if (outSequenceBean == null || outSequenceBean.getValue() == 
null) {
+               if (outSequenceID == null) {
                        identifierStr = Sandesha2Constants.TEMP_SEQUENCE_ID;
 
                } else {
-                       identifierStr = outSequenceBean.getValue();
+                       identifierStr = outSequenceID;
                }
 
                Identifier id1 = new Identifier(rmNamespaceValue);
@@ -750,7 +744,7 @@
                appMsgEntry.setMessageID(rmMsg.getMessageId());
                appMsgEntry.setMessageNumber(messageNumber);
                
appMsgEntry.setMessageType(Sandesha2Constants.MessageTypes.APPLICATION);
-               if (outSequenceBean == null || outSequenceBean.getValue() == 
null) {
+               if (outSequenceID == null) {
                        appMsgEntry.setSend(false);
                } else {
                        appMsgEntry.setSend(true);

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 Thu Dec  7 04:21:25 2006
@@ -174,13 +174,6 @@
                                        // Only will be used by the server side 
response path. Will
                                        // be wasted properties for the client 
side.
 
-                                       // setting the out_sequence_id
-                                       SequencePropertyBean outSequenceBean = 
new SequencePropertyBean();
-                                       
outSequenceBean.setName(Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
-                                       
outSequenceBean.setValue(offeredSequenceID);
-                                       
outSequenceBean.setSequencePropertyKey(outgoingSideSequencePropertyKey);
-                                       seqPropMgr.insert(outSequenceBean);
-
                                        // setting the internal_sequence_id
                                        SequencePropertyBean 
internalSequenceBean = new SequencePropertyBean();
                                        
internalSequenceBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
 Thu Dec  7 04:21:25 2006
@@ -142,12 +142,9 @@
 
                // storing new out sequence id
                SequencePropertyBeanMgr sequencePropMgr = 
storageManager.getSequencePropertyBeanMgr();
-               SequencePropertyBean outSequenceBean = new 
SequencePropertyBean(sequencePropertyKey,
-                               
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID, newOutSequenceId);
                SequencePropertyBean internalSequenceBean = new 
SequencePropertyBean(newOutSequenceId,
                                
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, 
sequencePropertyKey);
 
-               sequencePropMgr.insert(outSequenceBean);
                sequencePropMgr.insert(internalSequenceBean);
                
                // Store the security token under the new sequence id

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=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 Thu Dec  7 04:21:25 2006
@@ -228,8 +228,8 @@
 
                        // If all the out message have been acked, add the 
outgoing
                        // terminate seq msg.
-                       String outgoingSequnceID = 
SandeshaUtil.getSequenceProperty(responseSideSequencePropertyKey,
-                                       
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID, storageManager);
+                       String outgoingSequnceID = 
SandeshaUtil.getSequenceIDFromInternalSequenceID(responseSideSequencePropertyKey,
 storageManager); 
+
                        if (addResponseSideTerminate && highestOutMsgNo > 0 && 
responseSideSequencePropertyKey != null
                                        && outgoingSequnceID != null) {
                                boolean allAcked = 
SandeshaUtil.isAllMsgsAckedUpto(highestOutMsgNo, 
responseSideSequencePropertyKey,

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java 
(original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java 
Thu Dec  7 04:21:25 2006
@@ -75,6 +75,7 @@
 import org.apache.sandesha2.security.SecurityManager;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.CreateSeqBean;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
 import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
 import org.apache.sandesha2.workers.Invoker;
@@ -716,14 +717,16 @@
        public static String getSequenceIDFromInternalSequenceID(String 
internalSequenceID,
                        StorageManager storageManager) throws SandeshaException 
{
 
-               SequencePropertyBeanMgr sequencePropertyBeanMgr = 
storageManager.getSequencePropertyBeanMgr();
+               CreateSeqBean createSeqFindBean = new CreateSeqBean();
+               createSeqFindBean.setInternalSequenceID(internalSequenceID);
 
-               SequencePropertyBean outSequenceBean = 
sequencePropertyBeanMgr.retrieve(internalSequenceID,
-                               
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
+               CreateSeqBean createSeqBean = 
storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
 
                String sequeunceID = null;
-               if (outSequenceBean != null)
-                       sequeunceID = outSequenceBean.getValue();
+               if (createSeqBean != null && 
+                               createSeqBean.getSequenceID() != null &&
+                               
!createSeqBean.getSequenceID().equals(Sandesha2Constants.TEMP_SEQUENCE_ID))
+                       sequeunceID = createSeqBean.getSequenceID();
 
                return sequeunceID;
        }

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=483430&r1=483429&r2=483430
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
 Thu Dec  7 04:21:25 2006
@@ -23,10 +23,10 @@
 import java.util.Iterator;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.RMMsgContext;
@@ -282,26 +282,6 @@
                SenderBeanMgr retransmitterBeanMgr = 
storageManager.getRetransmitterBeanMgr();
                CreateSeqBeanMgr createSeqBeanMgr = 
storageManager.getCreateSeqBeanMgr();
 
-               String outSequenceID = 
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
-                               
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID, storageManager);
-
-               if (!serverSide) {
-                       boolean stopListnerForAsyncAcks = false;
-                       SequencePropertyBean acksToBean = 
sequencePropertyBeanMgr.retrieve(sequencePropertyKey,
-                                       
Sandesha2Constants.SequenceProperties.ACKS_TO_EPR);
-
-                       String addressingNamespace = 
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
-                                       
Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE, 
storageManager);
-                       String anonymousURI = 
SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace);
-
-                       if (acksToBean != null) {
-                               String acksTo = acksToBean.getValue();
-                               if (acksTo != null && 
!anonymousURI.equals(acksTo)) {
-                                       stopListnerForAsyncAcks = true;
-                               }
-                       }
-               }
-
                // removing retransmitterMgr entries and corresponding message 
contexts.
                Collection collection = 
retransmitterBeanMgr.find(internalSequenceId);
                Iterator iterator = collection.iterator();
@@ -314,15 +294,14 @@
                }
 
                // removing the createSeqMgrEntry
-               CreateSeqBean findCreateSequenceBean = new CreateSeqBean();
-               
findCreateSequenceBean.setInternalSequenceID(internalSequenceId);
-               collection = createSeqBeanMgr.find(findCreateSequenceBean);
-               iterator = collection.iterator();
-               while (iterator.hasNext()) {
-                       CreateSeqBean createSeqBean = (CreateSeqBean) 
iterator.next();
-                       
createSeqBeanMgr.delete(createSeqBean.getCreateSeqMsgID());
-               }
+               CreateSeqBean createSeqFindBean = new CreateSeqBean();
+               createSeqFindBean.setInternalSequenceID(internalSequenceId);
 
+               CreateSeqBean createSeqBean = 
storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+               createSeqBeanMgr.delete(createSeqBean.getCreateSeqMsgID());
+
+               String outSequenceID = createSeqBean.getSequenceID();
+               
                // removing sequence properties
                SequencePropertyBean findSequencePropertyBean1 = new 
SequencePropertyBean();
                
findSequencePropertyBean1.setSequencePropertyKey(sequencePropertyKey);
@@ -406,7 +385,7 @@
                SequencePropertyBean transportToBean = 
seqPropMgr.retrieve(sequencePropertyKey,
                                
Sandesha2Constants.SequenceProperties.TRANSPORT_TO);
                if (transportToBean != null) {
-                       
terminateRMMessage.setProperty(MessageContextConstants.TRANSPORT_URL, 
transportToBean.getValue());
+                       
terminateRMMessage.setProperty(Constants.Configuration.TRANSPORT_URL, 
transportToBean.getValue());
                }
 
                terminateRMMessage.addSOAPEnvelope();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to