diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinder.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinder.java index e25751160363..25cff61e2702 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinder.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinder.java @@ -227,7 +227,6 @@ public void deadLetter(String destination, .getHeaders() .get(ServiceBusMessageHeaders.RECEIVED_MESSAGE_CONTEXT); if (messageContext != null) { - messageContext.deadLetter(); DeadLetterOptions options = new DeadLetterOptions(); options.setDeadLetterReason(deadLetterReason); options.setDeadLetterErrorDescription(deadLetterErrorDescription); diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java index 749e16e2329b..d5641327dd0b 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -105,6 +106,7 @@ void testDeadLetterCalledForError() { ErrorMessage msg = new ErrorMessage(new RuntimeException(description), originalMessage); handler.handleMessage(msg); verify(messageContext).deadLetter(captor.capture()); + verify(messageContext, never()).deadLetter(); assertEquals("exception-message", captor.getValue().getDeadLetterReason()); assertEquals(description, captor.getValue().getDeadLetterErrorDescription()); }