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 2006/11/30 12:04:46 UTC
svn commit: r480889 -
/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Author: mlovett
Date: Thu Nov 30 03:04:44 2006
New Revision: 480889
URL: http://svn.apache.org/viewvc?view=rev&rev=480889
Log:
Andy's latest deadlock patch for SANDESHA2-49
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=480889&r1=480888&r2=480889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Thu Nov 30 03:04:44 2006
@@ -118,14 +118,6 @@
log.debug(message);
throw new SandeshaException(message);
}
-
- String internalSequenceId = SandeshaUtil.getSequenceProperty(outSequenceId,
- Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
- if(log.isDebugEnabled()) log.debug("Got ack for RM Sequence: " + outSequenceId + ", internal id: " + internalSequenceId);
-
- //here we cannot get the property key using the usual SandeshaUtil.getSequencePropertyKey function,
- //because this can be a applicationMessage, which piggybacks the acknowledgement.
- String sequencePropertyKey = internalSequenceId;
// Check that the sender of this Ack holds the correct token
SequencePropertyBean tokenBean = seqPropMgr.retrieve(outSequenceId, Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
@@ -148,6 +140,14 @@
if (fault != null) {
throw fault;
}
+
+ String internalSequenceId = SandeshaUtil.getSequenceProperty(outSequenceId,
+ Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
+ if(log.isDebugEnabled()) log.debug("Got ack for RM Sequence: " + outSequenceId + ", internal id: " + internalSequenceId);
+
+ //here we cannot get the property key using the usual SandeshaUtil.getSequencePropertyKey function,
+ //because this can be a applicationMessage, which piggybacks the acknowledgement.
+ String sequencePropertyKey = internalSequenceId;
SenderBean input = new SenderBean();
input.setSend(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org