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 15:25:53 UTC
svn commit: r480939 - in
/webservices/sandesha/trunk/java/src/org/apache/sandesha2:
client/SandeshaClient.java util/AcknowledgementManager.java
Author: mlovett
Date: Thu Nov 30 06:25:53 2006
New Revision: 480939
URL: http://svn.apache.org/viewvc?view=rev&rev=480939
Log:
Another deadlock patch from Andy, for SANDESHA2-49
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
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=480939&r1=480938&r2=480939
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Thu Nov 30 06:25:53 2006
@@ -175,7 +175,7 @@
}
sequenceReport.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_ESTABLISHED);
- fillOutgoingSequenceInfo(sequenceReport, outSequenceID, seqPropMgr);
+ fillOutgoingSequenceInfo(sequenceReport, internalSequenceID, outSequenceID, seqPropMgr);
} catch (Exception e) {
if (!withinTransaction && reportTransaction!=null) {
@@ -932,7 +932,7 @@
report.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_TERMINATED);
String outSequenceID = internalSequenceBean.getSequencePropertyKey();
- fillOutgoingSequenceInfo(report, outSequenceID, seqPropMgr);
+ fillOutgoingSequenceInfo(report, internalSequenceID, outSequenceID, seqPropMgr);
}
private static void fillTimedoutOutgoingSequenceInfo(SequenceReport report, String internalSequenceID,
@@ -952,14 +952,14 @@
report.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_TIMED_OUT);
String outSequenceID = internalSequenceBean.getSequencePropertyKey();
- fillOutgoingSequenceInfo(report, outSequenceID, seqPropMgr);
+ fillOutgoingSequenceInfo(report, internalSequenceID, outSequenceID, seqPropMgr);
}
- private static void fillOutgoingSequenceInfo(SequenceReport report, String outSequenceID,
+ private static void fillOutgoingSequenceInfo(SequenceReport report, String internalSequenceID, String outSequenceID,
SequencePropertyBeanMgr seqPropMgr) throws SandeshaException {
report.setSequenceID(outSequenceID);
- ArrayList completedMessageList = AcknowledgementManager.getClientCompletedMessagesList(outSequenceID,
+ ArrayList completedMessageList = AcknowledgementManager.getClientCompletedMessagesList(internalSequenceID, outSequenceID,
seqPropMgr);
Iterator iter = completedMessageList.iterator();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=480939&r1=480938&r2=480939
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java Thu Nov 30 06:25:53 2006
@@ -34,7 +34,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -152,18 +151,11 @@
* @param outGoingMessage
* @return
*/
- public static ArrayList getClientCompletedMessagesList(String sequenceID, SequencePropertyBeanMgr seqPropMgr)
+ public static ArrayList getClientCompletedMessagesList(String internalSequenceID, String sequenceID, SequencePropertyBeanMgr seqPropMgr)
throws SandeshaException {
if (log.isDebugEnabled())
- log.debug("Enter: AcknowledgementManager::getClientCompletedMessagesList");
-
- // first trying to get it from the internal sequence id.
- SequencePropertyBean internalSequenceBean = seqPropMgr.retrieve(sequenceID,
- Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
- String internalSequenceID = null;
- if (internalSequenceBean != null)
- internalSequenceID = internalSequenceBean.getValue();
-
+ log.debug("Enter: AcknowledgementManager::getClientCompletedMessagesList " + internalSequenceID + ", " + sequenceID);
+
SequencePropertyBean completedMessagesBean = null;
if (internalSequenceID != null)
completedMessagesBean = seqPropMgr.retrieve(internalSequenceID,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org