activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1611115 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp: MessageConsumer.cs MessageProducer.cs QueueBrowser.cs Session.cs
Date Wed, 16 Jul 2014 17:55:19 GMT
Author: tabish
Date: Wed Jul 16 17:55:19 2014
New Revision: 1611115

URL: http://svn.apache.org/r1611115
Log:
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)

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageProducer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/QueueBrowser.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs?rev=1611115&r1=1611114&r2=1611115&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
Wed Jul 16 17:55:19 2014
@@ -456,8 +456,8 @@ namespace Apache.NMS.ActiveMQ
 			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);

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageProducer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageProducer.cs?rev=1611115&r1=1611114&r2=1611115&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageProducer.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageProducer.cs
Wed Jul 16 17:55:19 2014
@@ -120,7 +120,8 @@ namespace Apache.NMS.ActiveMQ
 				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);
 				}
 			}
 		}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/QueueBrowser.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/QueueBrowser.cs?rev=1611115&r1=1611114&r2=1611115&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/QueueBrowser.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/QueueBrowser.cs Wed
Jul 16 17:55:19 2014
@@ -115,7 +115,6 @@ namespace Apache.NMS.ActiveMQ
 				if(consumer != null)
 				{
 					this.session.RemoveConsumer(consumer);
-					consumer.Close();
 				}
 
 				throw;

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs?rev=1611115&r1=1611114&r2=1611115&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs Wed Jul
16 17:55:19 2014
@@ -444,7 +444,6 @@ namespace Apache.NMS.ActiveMQ
                 if(producer != null)
                 {
                     this.RemoveProducer(producer.ProducerId);
-                    producer.Close();
                 }
 
                 throw;
@@ -510,7 +509,6 @@ namespace Apache.NMS.ActiveMQ
                 if(consumer != null)
                 {
                     this.RemoveConsumer(consumer);
-                    consumer.Close();
                 }
 
                 throw;
@@ -557,7 +555,6 @@ namespace Apache.NMS.ActiveMQ
                 if(consumer != null)
                 {
                     this.RemoveConsumer(consumer);
-                    consumer.Close();
                 }
 
                 throw;



Mime
View raw message