From fa904ce51def48294ee28f8fa9c3ee3f26d7d38a Mon Sep 17 00:00:00 2001 From: markpollack Date: Fri, 9 Jan 2009 15:00:36 +0000 Subject: [PATCH] SPRNET-1130 - Wrong MessageQueueException handling in DistributedTxMessageListenerContainer and TransactionalMessageListenerContainer --- .../Listener/AbstractPeekingMessageListenerContainer.cs | 1 - .../Messaging/Listener/DistributedTxMessageListenerContainer.cs | 2 +- .../Messaging/Listener/TransactionalMessageListenerContainer.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs index 37cddd14..9b293f45 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs @@ -134,7 +134,6 @@ namespace Spring.Messaging.Listener /// /// Wait for all listener threads to exit and closes the DefaultMessageQueue. - /// /// protected override void DoShutdown() { diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs index 6153eb45..bda5feec 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs @@ -116,7 +116,7 @@ namespace Spring.Messaging.Listener } catch (MessageQueueException ex) { - if (ex.MessageQueueErrorCode != MessageQueueErrorCode.IOTimeout) + if (ex.MessageQueueErrorCode == MessageQueueErrorCode.IOTimeout) { //expected to occur occasionally diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs index dbfb0678..5971f5a9 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs @@ -309,7 +309,7 @@ namespace Spring.Messaging.Listener } catch (MessageQueueException ex) { - if (ex.MessageQueueErrorCode != MessageQueueErrorCode.IOTimeout) + if (ex.MessageQueueErrorCode == MessageQueueErrorCode.IOTimeout) { //expected to occur occasionally if (LOG.IsTraceEnabled)