activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r657942 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/src/main/csharp/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/ Apache.NMS/trunk/src/test/csharp/
Date Mon, 19 May 2008 19:50:28 GMT
Author: jgomes
Date: Mon May 19 12:50:28 2008
New Revision: 657942

URL: http://svn.apache.org/viewvc?rev=657942&view=rev
Log:
Applying patch from Odilon Oliveira to fix compile errors for .NET 1.1.

Modified:
    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
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs

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=657942&r1=657941&r2=657942&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 Mon May
19 12:50:28 2008
@@ -50,8 +50,8 @@
 			this.brokerUri = connectionUri;
 			this.info = info;
 			this.transport = transport;
-			this.transport.Command = OnCommand;
-			this.transport.Exception = OnException;
+			this.transport.Command = new CommandHandler(OnCommand);
+			this.transport.Exception = new ExceptionHandler(OnException);
 			this.transport.Start();
 		}
 

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=657942&r1=657941&r2=657942&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
Mon May 19 12:50:28 2008
@@ -194,7 +194,7 @@
 			{
 				if(ackSession != null)
 				{
-					message.Acknowledger += DoNothingAcknowledge;
+					message.Acknowledger += new AcknowledgeHandler(DoNothingAcknowledge);
 					MessageAck ack = CreateMessageAck(message);
 					Tracer.Debug("Sending AutoAck: " + ack);
 					ackSession.Connection.OneWay(ack);
@@ -247,11 +247,11 @@
 
 				if(AcknowledgementMode.ClientAcknowledge == acknowledgementMode)
 				{
-					activeMessage.Acknowledger += DoClientAcknowledge;
+					activeMessage.Acknowledger += new AcknowledgeHandler(DoClientAcknowledge);
 				}
 				else if(AcknowledgementMode.AutoAcknowledge != acknowledgementMode)
 				{
-					activeMessage.Acknowledger += DoNothingAcknowledge;
+					activeMessage.Acknowledger += new AcknowledgeHandler(DoNothingAcknowledge);
 					DoClientAcknowledge(activeMessage);
 				}
 			}

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=657942&r1=657941&r2=657942&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 Mon May
19 12:50:28 2008
@@ -53,8 +53,8 @@
 			this.acknowledgementMode = acknowledgementMode;
 			this.asyncSend = connection.AsyncSend;
 			transactionContext = new TransactionContext(this);
-			dispatchingThread = new DispatchingThread(DispatchAsyncMessages);
-			dispatchingThread.ExceptionListener += dispatchingThread_ExceptionListener;
+			dispatchingThread = new DispatchingThread(new DispatchingThread.DispatchFunction(DispatchAsyncMessages));
+			dispatchingThread.ExceptionListener += new DispatchingThread.ExceptionHandler(dispatchingThread_ExceptionListener);
 		}
 
 		~Session()

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs?rev=657942&r1=657941&r2=657942&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
Mon May 19 12:50:28 2008
@@ -80,7 +80,7 @@
 					socketReader = new OpenWireBinaryReader(new NetworkStream(socket));
 	                
 					// now lets create the background read thread
-					readThread = new Thread(ReadLoop);
+					readThread = new Thread(new ThreadStart(ReadLoop));
 					readThread.Start();
 				}
 			}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=657942&r1=657941&r2=657942&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Mon May 19 12:50:28 2008
@@ -96,10 +96,10 @@
 		{
 			// Looping through the AddressList allows different type of connections to be tried
 			// (IPv4, IPv6 and whatever else may be available).
-#if MONO
+#if MONO || NET_1_1 || NET_1_0
 			// The following GetHostByName() API has been obsoleted in .NET 2.0.  It has been
 			// superceded by GetHostEntry().  At some point, it will probably be removed
-			// from the Mono class library, and this #if statement can be removed.
+			// from the Mono class library, and this #if statement can be modified.
 
 			IPHostEntry hostEntry = Dns.GetHostByName(host);
 #else

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs?rev=657942&r1=657941&r2=657942&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs Mon May 19 12:50:28
2008
@@ -97,7 +97,7 @@
 			destinationType = DestinationType.Queue;
 			// Launch a thread to perform IMessageConsumer.Receive().
 			// If it doesn't fail in less than three seconds, no exception was thrown.
-			Thread receiveThread = new Thread(doTestNoTimeoutConsumer);
+			Thread receiveThread = new Thread(new ThreadStart(doTestNoTimeoutConsumer));
 
 			using(timeoutConsumer = Session.CreateConsumer(Destination))
 			{



Mime
View raw message