activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1064880 - /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs
Date Fri, 28 Jan 2011 21:03:25 GMT
Author: tabish
Date: Fri Jan 28 21:03:25 2011
New Revision: 1064880

URL: http://svn.apache.org/viewvc?rev=1064880&view=rev
Log:
Account for yet another undocumented thread context switch in the MSDTC code.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs?rev=1064880&r1=1064879&r2=1064880&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/TransactionContext.cs
Fri Jan 28 21:03:25 2011
@@ -554,11 +554,13 @@ namespace Apache.NMS.ActiveMQ
 
                 foreach (KeyValuePair<XATransactionId, byte[]> recoverable in matches)
                 {
-                    TransactionManager.Reenlist(ResourceManagerGuid, recoverable.Value, this);
+                    this.transactionId = recoverable.Key;
+                    this.currentEnlistment = 
+                        TransactionManager.Reenlist(ResourceManagerGuid, recoverable.Value,
this);
                 }
 
-                TransactionManager.RecoveryComplete(ResourceManagerGuid);
                 this.recoveryComplete.await();
+                TransactionManager.RecoveryComplete(ResourceManagerGuid);
                 return;
             }
 



Mime
View raw message