diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java index fbeff0bb..f1ec6366 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java @@ -117,6 +117,8 @@ public abstract class AbstractRabbitListenerContainerFactory c.setShutdownTimeout(10_000)); + this.factory.setForceStop(true); assertThat(this.factory.getAdviceChain()).isEqualTo(new Advice[]{advice}); @@ -150,6 +151,7 @@ public class RabbitListenerContainerFactoryTests { assertThat(actualAfterReceivePostProcessors.size()).as("Wrong number of afterReceivePostProcessors").isEqualTo(1); assertThat(actualAfterReceivePostProcessors.get(0)).as("Wrong advice").isSameAs(afterReceivePostProcessor); assertThat(fieldAccessor.getPropertyValue("globalQos")).isEqualTo(true); + assertThat(TestUtils.getPropertyValue(container, "forceStop", Boolean.class)).isTrue(); } @Test @@ -176,6 +178,7 @@ public class RabbitListenerContainerFactoryTests { this.direct.setMessagesPerAck(5); this.direct.setAckTimeout(3L); this.direct.setAfterReceivePostProcessors(afterReceivePostProcessor); + this.direct.setForceStop(true); assertThat(this.direct.getAdviceChain()).isEqualTo(new Advice[]{advice}); @@ -207,6 +210,7 @@ public class RabbitListenerContainerFactoryTests { List actualAfterReceivePostProcessors = (List) fieldAccessor.getPropertyValue("afterReceivePostProcessors"); assertThat(actualAfterReceivePostProcessors.size()).as("Wrong number of afterReceivePostProcessors").isEqualTo(1); assertThat(actualAfterReceivePostProcessors.get(0)).as("Wrong afterReceivePostProcessor").isSameAs(afterReceivePostProcessor); + assertThat(TestUtils.getPropertyValue(container, "forceStop", Boolean.class)).isTrue(); } private void setBasicConfig(AbstractRabbitListenerContainerFactory factory) {