Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add reconnection logic to SimpleMessageListenerContainer.

Browse Source 
Test for SimpleMessageListenerContainer's ExceptionListener being invoked (SPRNET-542)
This commit is contained in:
markpollack
2008-08-12 02:55:54 +00:00
parent 2e55bc71b4
commit 21fe0a1919
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs
View File

@@ -40,7 +40,7 @@ namespace Spring.Messaging.Nms.Connections
/// SessionCacheSize property in case of a high-concurrency environment.
/// </remarks>
/// <author>Juergen Hoeller</author>
/// <author>Mark Pollack</author>
/// <author>Mark Pollack (.NET)</author>
public class CachingConnectionFactory : SingleConnectionFactory
{
#region Logging Definition

15
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
View File

@@ -275,15 +275,14 @@ namespace Spring.Messaging.Nms.Connections
{
con.ClientId = ClientId;
}
if (ExceptionListener != null || ReconnectOnException)
if (reconnectOnException)
{
IExceptionListener listenerToUse = ExceptionListener;
if (ReconnectOnException)
{
//add reconnect exception handler first.
con.ExceptionListener += new ExceptionListener(this.OnException);
}
con.ExceptionListener += new ExceptionListener(listenerToUse.OnException);
//add reconnect exception handler first to exception chain.
con.ExceptionListener += new ExceptionListener(this.OnException);
}
if (ExceptionListener != null)
{
con.ExceptionListener += new ExceptionListener(ExceptionListener.OnException);
}
}

2
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs
View File

@@ -898,7 +898,7 @@ namespace Spring.Messaging.Nms.Core
{
CheckMessageConverter();
Send(destinationName, new ConvertAndSendMessageCreator(this, message, postProcessor));
}
/// <summary> Receive a message synchronously from the default destination, but only

2
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
View File

@@ -192,7 +192,7 @@ namespace Spring.Messaging.Nms.Listener
public void OnException(Exception exception)
{
// First invoke the user-specific ExceptionListener, if any.
//InvokeExceptionListener(exception);
InvokeExceptionListener(exception);
// now try to recover the shared Connection and all consumers...
if (logger.IsInfoEnabled)
{

2
test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
View File

@@ -149,7 +149,7 @@ namespace Spring.Messaging.Nms.Connections
IConnection connection = new TestConnection();
Expect.Call(connectionFactory.CreateConnection()).Return(connection).Repeat.Once();
mocks.ReplayAll();

2
test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.xml
View File

@@ -23,7 +23,7 @@
<object id="SimpleMessageListener" type="Spring.Messaging.Nms.Integration.SimpleMessageListener, Spring.Messaging.Nms.Tests"/>
<object name="NmsTemplate" type="Spring.Messaging.Nms.NmsTemplate, Spring.Messaging.Nms">
<object name="NmsTemplate" type="Spring.Messaging.Nms.Core.NmsTemplate, Spring.Messaging.Nms">
<property name="ConnectionFactory" ref="ConnectionFactory"/>
<property name="DefaultDestinationName" value="test.queue"/>
</object>