https://issues.apache.org/jira/browse/AMQNET-482
Don't try to remove a consumer that has not been registered. Also log the destination of the producer or consumer that is being closed for more debug information.
Fixes [AMQNET-AMQNET-482]. (See https://issues.apache.org/jira/browse/AMQNET-AMQNET-482)
diff --git a/src/main/csharp/MessageConsumer.cs b/src/main/csharp/MessageConsumer.cs
index a790092..d12b9d9 100755
--- a/src/main/csharp/MessageConsumer.cs
+++ b/src/main/csharp/MessageConsumer.cs
@@ -456,8 +456,8 @@
removeCommand.ObjectId = this.ConsumerId;
if (Tracer.IsDebugEnabled)
{
- Tracer.DebugFormat("Remove of Consumer[{0}] sent last delivered Id[{1}].",
- this.ConsumerId, this.lastDeliveredSequenceId);
+ Tracer.DebugFormat("Remove of Consumer[{0}] of destination [{1}] sent last delivered Id[{2}].",
+ this.ConsumerId, this.info.Destination, this.lastDeliveredSequenceId);
}
removeCommand.LastDeliveredSequenceId = lastDeliveredSequenceId;
this.session.Connection.Oneway(removeCommand);
diff --git a/src/main/csharp/MessageProducer.cs b/src/main/csharp/MessageProducer.cs
index 667c3e8..95dfafd 100755
--- a/src/main/csharp/MessageProducer.cs
+++ b/src/main/csharp/MessageProducer.cs
@@ -120,7 +120,8 @@
this.session.Connection.Oneway(removeInfo);
if(Tracer.IsDebugEnabled)
{
- Tracer.DebugFormat("Remove of Producer[{0}] sent.", this.ProducerId);
+ Tracer.DebugFormat("Remove of Producer[{0}] for destination[{1}] sent.",
+ this.ProducerId, this.info.Destination);
}
}
}
diff --git a/src/main/csharp/QueueBrowser.cs b/src/main/csharp/QueueBrowser.cs
index e8d3c93..6bb5821 100644
--- a/src/main/csharp/QueueBrowser.cs
+++ b/src/main/csharp/QueueBrowser.cs
@@ -115,7 +115,6 @@
if(consumer != null)
{
this.session.RemoveConsumer(consumer);
- consumer.Close();
}
throw;
diff --git a/src/main/csharp/Session.cs b/src/main/csharp/Session.cs
index c981bcd..878c208 100755
--- a/src/main/csharp/Session.cs
+++ b/src/main/csharp/Session.cs
@@ -444,7 +444,6 @@
if(producer != null)
{
this.RemoveProducer(producer.ProducerId);
- producer.Close();
}
throw;
@@ -510,7 +509,6 @@
if(consumer != null)
{
this.RemoveConsumer(consumer);
- consumer.Close();
}
throw;
@@ -557,7 +555,6 @@
if(consumer != null)
{
this.RemoveConsumer(consumer);
- consumer.Close();
}
throw;
