GH-2949: Fix retryCount handling #2950
Merged
Conversation
This file contains hidden or 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
Fixes spring-projects#2949 The handling of retryCount is moved into convertHeadersIfNecessary(), so that we can still return a Collections.emptyMap() if there are no headers in the source MessageProperties and no retryCount to add. Signed-off-by: Johan Kaving <[email protected]>
jkaving
commented
Feb 4, 2025
Comment on lines
-158
to
-162
| Map<String, Object> headers = convertHeadersIfNecessary(source.getHeaders()); | ||
| long retryCount = source.getRetryCount(); | ||
| if (retryCount > 0) { | ||
| headers.put(MessageProperties.RETRY_COUNT, retryCount); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
An alternative solution could be to keep the retryCount code here, but add some kind of check inside the if (retryCount > 0) block.
We could e.g., check if headers is empty:
...
if (retryCount > 0) {
if (headers.isEmpty()) {
headers = new HashMap<>();
}
headers.put(MessageProperties.RETRY_COUNT, retryCount);
}
...or catch the exception:
...
if (retryCount > 0) {
try {
headers.put(MessageProperties.RETRY_COUNT, retryCount);
} catch (UnsupportedOperationException e) {
headers = Map.of(MessageProperties.RETRY_COUNT, retryCount);
}
}
...
artembilan
approved these changes
Feb 4, 2025
Member
artembilan
left a comment
artembilan
left a comment
There was a problem hiding this comment.
I think I'm fine with what you did so far: less objects is better.
Sorry about missing the case when map of headers could be empty.
Will merge when the build is green.
Thank you!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2949
The handling of
retryCountis moved intoconvertHeadersIfNecessary(), so that we can still return aCollections.emptyMap()if there are no headers in the sourceMessagePropertiesand noretryCountto add.