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.
diff --git a/src/main/csharp/MessageConsumer.cs b/src/main/csharp/MessageConsumer.cs
index e78c705..3d77291 100755
--- a/src/main/csharp/MessageConsumer.cs
+++ b/src/main/csharp/MessageConsumer.cs
@@ -1781,20 +1781,11 @@
{
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)
{
