Skip to content

Commit 39a4b45

Browse files
Check null for context#getLastThrowable
Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent a1437de commit 39a4b45

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private void setupRecoveryCallbackIfAny() {
290290
context -> {
291291
Message messageToRecover =
292292
(Message) context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE);
293-
if (messageToRecover != null) {
293+
if (messageToRecover != null && context.getLastThrowable() != null) {
294294
messageRecovererToUse.recover(messageToRecover, context.getLastThrowable());
295295
}
296296
return null;

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ private void setupRecoveryCallbackIfAny() {
289289
context -> {
290290
Message messageToRecover =
291291
(Message) context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE);
292-
if (messageToRecover != null) {
292+
if (messageToRecover != null && context.getLastThrowable() != null) {
293293
messageRecovererToUse.recover(messageToRecover, context.getLastThrowable());
294294
}
295295
return null;

0 commit comments

Comments
 (0)