activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r693527 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: ./ src/main/csharp/Connection.cs src/main/csharp/MessageConsumer.cs src/main/csharp/Session.cs
Date Tue, 09 Sep 2008 17:55:01 GMT
Author: jgomes
Date: Tue Sep  9 10:55:01 2008
New Revision: 693527

URL: http://svn.apache.org/viewvc?rev=693527&view=rev
Log:
Merge fix from 1.0.0 branch.
Fixes [AMQNET-111]. (See https://issues.apache.org/activemq/browse/AMQNET-111)

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  9 10:55:01 2008
@@ -1 +1 @@
-/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=693527&r1=693526&r2=693527&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs Tue Sep
 9 10:55:01 2008
@@ -118,7 +118,7 @@
 					started = true;
 					foreach(Session session in sessions)
 					{
-						session.StartAsyncDelivery(null);
+						session.StartAsyncDelivery();
 					}
 				}
 			}
@@ -178,7 +178,7 @@
 			{
 				if(IsStarted)
 				{
-					session.StartAsyncDelivery(null);
+					session.StartAsyncDelivery();
 				}
 
 				sessions.Add(session);

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=693527&r1=693526&r2=693527&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
Tue Sep  9 10:55:01 2008
@@ -90,7 +90,7 @@
 			add
 			{
 				listener += value;
-				session.StartAsyncDelivery(dispatcher);
+				session.RegisterConsumerDispatcher(dispatcher);
 			}
 			remove { listener -= value; }
 		}
@@ -343,4 +343,4 @@
 
 		#endregion
 	}
-}
\ No newline at end of file
+}

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=693527&r1=693526&r2=693527&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 Tue Sep
 9 10:55:01 2008
@@ -676,18 +676,18 @@
 			}
 		}
 
-		internal void StartAsyncDelivery(Dispatcher dispatcher)
+		internal void StartAsyncDelivery()
 		{
-			if(dispatcher != null)
-			{
-				dispatcher.SetAsyncDelivery(dispatchingThread.EventHandle);
-			}
-
 			if(!dispatchingThread.IsStarted)
 			{
 				this.dispatchingThread.ExceptionListener += this.dispatchingThread_ExceptionHandler;
 				dispatchingThread.Start();
 			}
 		}
+
+		internal void RegisterConsumerDispatcher(Dispatcher dispatcher)
+		{
+			dispatcher.SetAsyncDelivery(this.dispatchingThread.EventHandle);
+		}
 	}
 }



Mime
View raw message