From fbf61b0785064522ab0981bdd1d1fef5b3486e65 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 10 May 2011 14:22:22 +0100 Subject: [PATCH] Use basicNack instead of basicReject --- .../amqp/rabbit/listener/AbstractMessageListenerContainer.java | 3 ++- .../SimpleMessageListenerContainerIntegrationTests.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java index 077ea38e..4f94e24e 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java @@ -629,7 +629,8 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor im if (logger.isDebugEnabled()) { logger.debug("Rejecting message"); } - channel.basicReject(message.getMessageProperties().getDeliveryTag(), true); + // channel.basicReject(message.getMessageProperties().getDeliveryTag(), true); + channel.basicNack(message.getMessageProperties().getDeliveryTag(), true, true); } if (this.isChannelTransacted()) { // Need to commit the reject (=nack) diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java index 479af146..aed35113 100755 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java @@ -52,7 +52,7 @@ public class SimpleMessageListenerContainerIntegrationTests { private final AcknowledgeMode acknowledgeMode; @Rule - public Log4jLevelAdjuster logLevels = new Log4jLevelAdjuster(Level.ERROR, RabbitTemplate.class, + public Log4jLevelAdjuster logLevels = new Log4jLevelAdjuster(Level.OFF, RabbitTemplate.class, SimpleMessageListenerContainer.class, BlockingQueueConsumer.class); @Rule