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
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 77e67ef..f58f9d7 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -690,10 +690,7 @@
                 }
             }
 
-            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)
diff --git a/src/main/csharp/Transport/Failover/FailoverTransport.cs b/src/main/csharp/Transport/Failover/FailoverTransport.cs
index 12c23af..b4ab1ff 100644
--- a/src/main/csharp/Transport/Failover/FailoverTransport.cs
+++ b/src/main/csharp/Transport/Failover/FailoverTransport.cs
@@ -450,6 +450,7 @@
 
                     if(command.IsRemoveInfo)
                     {
+                        stateTracker.track(command);
                         // Simulate response to RemoveInfo command
                         Response response = new Response();
                         response.CorrelationId = command.CommandId;