You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2007/10/29 14:58:58 UTC
svn commit: r589631 - in
/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ: Dispatcher.cs
Transport/Tcp/TcpTransport.cs
Author: chirino
Date: Mon Oct 29 06:58:58 2007
New Revision: 589631
URL: http://svn.apache.org/viewvc?rev=589631&view=rev
Log:
Applying patches attached to https://issues.apache.org/activemq/browse/AMQNET-68 on 04/Oct/07
Modified:
activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs
activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs?rev=589631&r1=589630&r2=589631&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs Mon Oct 29 06:58:58 2007
@@ -130,7 +130,7 @@
while (!bClosed && rc == null)
{
- if( !messageReceivedEventHandle.WaitOne(timeout, false))
+ if( !messageReceivedEventHandle.WaitOne((int) timeout.TotalMilliseconds, false))
{
break;
}
Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs?rev=589631&r1=589630&r2=589631&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs Mon Oct 29 06:58:58 2007
@@ -159,7 +159,10 @@
if(null != readThread
&& Thread.CurrentThread != readThread
- && readThread.IsAlive)
+#if !NETCF
+ && readThread.IsAlive
+#endif
+ )
{
readThread.Abort();
readThread.Join();