activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1621155 [1/4] - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x: ./ src/main/csharp/ src/main/csharp/Commands/ src/main/csharp/Util/ src/test/csharp/Transport/failover/
Date Thu, 28 Aug 2014 15:54:35 GMT
Author: tabish
Date: Thu Aug 28 15:54:34 2014
New Revision: 1621155

URL: http://svn.apache.org/r1621155
Log:
https://issues.apache.org/jira/browse/AMQNET-471

Resolve issues around transaction rollback during normal operation or during a failure detected
with the FailoverTransport handling reconnection.  Issues involving false positives of duplicate
redelivery and messages not being properly re-added to the unconsumed channel after rollback
were fixed.  Also added logic to attempt to detect delivery of rolled back messages to another
consumer on the same connection which requires the TX be rolled back as invalid.  

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Commands/MessageDispatch.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Session.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/TransactionContext.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Util/FifoMessageDispatchChannel.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Util/MessageDispatchChannel.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Util/SimplePriorityMessageDispatchChannel.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/test/csharp/Transport/failover/FailoverTransactionTest.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/
------------------------------------------------------------------------------
  Merged /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk:r1621142

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Commands/MessageDispatch.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Commands/MessageDispatch.cs?rev=1621155&r1=1621154&r2=1621155&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Commands/MessageDispatch.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/Commands/MessageDispatch.cs
Thu Aug 28 15:54:34 2014
@@ -35,6 +35,8 @@ namespace Apache.NMS.ActiveMQ.Commands
         public const byte ID_MESSAGEDISPATCH = 21;
 
         private Exception rollbackCause = null;
+        private long deliverySequenceId;
+        private object consumer;
 
         ConsumerId consumerId;
         ActiveMQDestination destination;
@@ -75,6 +77,18 @@ namespace Apache.NMS.ActiveMQ.Commands
             set { this.rollbackCause = value; }
         }
 
+        public long DeliverySequenceId
+        {
+            get { return this.deliverySequenceId; }
+            set { this.deliverySequenceId = value; }
+        }
+
+        public object Consumer
+        {
+            get { return this.consumer; }
+            set { this.consumer = value; }
+        }
+
         public ConsumerId ConsumerId
         {
             get { return consumerId; }



Mime
View raw message