This repository has been archived by the owner on Mar 30, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix NPE for retryTemp!=null but recoveryCall==null
Starting with version `3.0.x`, the `KafkaInboundGateway` and `KafkaMessageDrivenChannelAdapter` rely on the `RetryContext.getRetryCount()` for the `IntegrationMessageHeaderAccessor.DELIVERY_ATTEMPT` message header, but the `RetryContext` is obtained from the `TheadLocal` `attributesHolder`, which is populated from the `RetryListener.open()` only if `recoveryCallback != null` * Fix `KafkaInboundGateway` and `KafkaMessageDrivenChannelAdapter` to populate `TheadLocal` `attributesHolder` with the `RetryContext` from the `RetryListener.open()` when only `retryTemplate != null` **Cherry-pick to `master` & 3.0.x**
- Loading branch information
1 parent
bc4a9f6
commit 6b9d8e2
Showing
4 changed files
with
142 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters