activemq-commits mailing list archives

Author: jgomes
Date: Mon Aug 20 22:54:48 2012
New Revision: 1375293

URL: http://svn.apache.org/viewvc?rev=1375293&view=rev
Log:
Merged revision(s) 1375292 from activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x:
Reimplement fix for zombie consumers to update the failover state tracker.
Fixes https://issues.apache.org/jira/browse/AMQNET-394

Modified:
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/Failover/FailoverTransport.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/
------------------------------------------------------------------------------
  Merged /activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x:r1375292

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs?rev=1375293&r1=1375292&r2=1375293&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs Mon Aug
20 22:54:48 2012
@@ -690,10 +690,7 @@ namespace Apache.NMS.Stomp
                 }
             }
 
-            Tracer.ErrorFormat("No such consumer active: {0}.  Removing...", dispatch.ConsumerId);
-            RemoveInfo info  = new RemoveInfo();
-            info.ObjectId = dispatch.ConsumerId;
-            transport.Oneway(info);
+            Tracer.ErrorFormat("No such consumer active: {0}.", dispatch.ConsumerId);
         }
 
         protected void OnTransportException(ITransport sender, Exception exception)

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/Failover/FailoverTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/Failover/FailoverTransport.cs?rev=1375293&r1=1375292&r2=1375293&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/Failover/FailoverTransport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/Failover/FailoverTransport.cs
Mon Aug 20 22:54:48 2012
@@ -450,6 +450,7 @@ namespace Apache.NMS.Stomp.Transport.Fai
 
                     if(command.IsRemoveInfo)
                     {
+                        stateTracker.track(command);
                         // Simulate response to RemoveInfo command
                         Response response = new Response();
                         response.CorrelationId = command.CommandId;