Author: tabish
Date: Thu Aug 21 21:18:29 2014
New Revision: 1619593
URL: http://svn.apache.org/r1619593
Log:
https://issues.apache.org/jira/browse/AMQNET-489
Merge in fixes from AMQ-5146 to honor the redelivery policy on messages
dispatched from the Broker.
Removed some debug logging.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
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=1619593&r1=1619592&r2=1619593&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
Thu Aug 21 21:18:29 2014
@@ -1781,20 +1781,11 @@ namespace Apache.NMS.ActiveMQ
{
ActiveMQMessage amqMessage = dispatch.Message as
ActiveMQMessage;
- Tracer.Debug("Checking if Redelivery count is exceeded.");
- Tracer.DebugFormat("Current policy = {0}",
RedeliveryPolicy.MaximumRedeliveries);
- Tracer.DebugFormat("Message Redelivery Count = {0}",
dispatch.RedeliveryCounter);
- Tracer.DebugFormat("Is Transacted? {0}", session.IsTransacted);
- Tracer.DebugFormat("Is Message from redelivery plugin? {0}",
amqMessage.Properties.Contains("redeliveryDelay"));
-
- bool result = session.IsTransacted && redeliveryPolicy != null
&&
+ return session.IsTransacted && redeliveryPolicy != null &&
redeliveryPolicy.MaximumRedeliveries !=
NO_MAXIMUM_REDELIVERIES &&
dispatch.RedeliveryCounter >
redeliveryPolicy.MaximumRedeliveries &&
// redeliveryCounter > x expected after resend via
brokerRedeliveryPlugin
!amqMessage.Properties.Contains("redeliveryDelay");
-
- Tracer.DebugFormat("Exceeded Redelivery Max? {0}", result);
- return result;
}
catch (Exception ignored)
{
