activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r905818 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp: MessageConsumer.cs Threads/CompositeTaskRunner.cs
Date Tue, 02 Feb 2010 22:20:33 GMT
Author: tabish
Date: Tue Feb  2 22:20:32 2010
New Revision: 905818

URL: http://svn.apache.org/viewvc?rev=905818&view=rev
Log:
More fixes for: http://issues.apache.org/activemq/browse/AMQNET-218

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/Threads/CompositeTaskRunner.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/MessageConsumer.cs?rev=905818&r1=905817&r2=905818&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/MessageConsumer.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/MessageConsumer.cs
Tue Feb  2 22:20:32 2010
@@ -72,7 +72,7 @@
 			this.info = info;
 			this.redeliveryPolicy = this.session.Connection.RedeliveryPolicy;
 		}
-        
+
 		~MessageConsumer()
 		{
 			Dispose(false);
@@ -506,7 +506,10 @@
                                 // If aborted we stop the abort here and let normal processing
resume.
                                 // This allows the session to shutdown normally and ack all
messages
                                 // that have outstanding acks in this consumer.
-                                Thread.ResetAbort();
+                                if( (Thread.CurrentThread.ThreadState & ThreadState.AbortRequested)
== ThreadState.AbortRequested)
+                                {
+                                    Thread.ResetAbort();
+                                }
 							}
 						}
 						else

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/Threads/CompositeTaskRunner.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/Threads/CompositeTaskRunner.cs?rev=905818&r1=905817&r2=905818&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/Threads/CompositeTaskRunner.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.2.x/src/main/csharp/Threads/CompositeTaskRunner.cs
Tue Feb  2 22:20:32 2010
@@ -155,10 +155,13 @@
                     }
                 }
             }
-            catch
+            catch(ThreadAbortException)
             {
                 Thread.ResetAbort();
             }
+            catch
+            {
+            }
             finally
             {        
                 // Make sure we notify any waiting threads that thread



Mime
View raw message