Read x-death count in a safer way #3006
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
18e3b08 to
b85d809
Compare
artembilan
requested changes
Mar 10, 2025
There was a problem hiding this comment.
The build has failed due to Checkstyle violations:
Error: eckstyle] [ERROR] /home/runner/work/spring-amqp/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java:36:1: Wrong order for 'org.springframework.util.NumberUtils' import. [ImportOrder]
> Task :spring-rabbit:checkstyleMain
Error: eckstyle] [ERROR] /home/runner/work/spring-amqp/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java:153:33: 'if' is not followed by whitespace. [WhitespaceAfter]
Error: eckstyle] [ERROR] /home/runner/work/spring-amqp/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java:153:33: 'if' is not followed by whitespace. [WhitespaceAround]
Also, please, add your name to the @author list of the affected classes.
In other place of the same class I just do:
if (value instanceof Number numberValue) {
target.setRetryCount(numberValue.longValue());
}
Instead of NumberUtils.
I mean you still have problem with Checkstyle, so might be better to not use it at all 😄
Please, run gradlew check command locally before pushing.
auto-merge was automatically disabled
March 12, 2025 13:40
Head branch was pushed to by a user without write access
Signed-off-by: Raul Avila <raul.avila@pagonxt.com>
034d987 to
eaa38be
Compare
|
Apologies for the slightly messy commit, I had some restrictions in my company laptop and couldn't do a proper build. Everything sorted now, any comments let me know. |
|
Thank you for contribution; looking forward for more! |
spring-builds
pushed a commit
that referenced
this pull request
Mar 12, 2025
Fixes: #3006 We had an issue in our system trying to consume a message from RabbitMQ that contained an `x-death` header, with count value typed as `Integer`. This caused a `ClassCastException`. The reason the count value was an int and not a long is that we were storing headers in an internal database as part of a recovery process, and the typing was slightly changed during serialisation / deserialisation. * Use `target.setRetryCount(numberValue.longValue());` in the `DefaultMessagePropertiesConverter` instead of cast to `long` Signed-off-by: Raul Avila <raul.avila@pagonxt.com> [artem.bilan@broadcom.com Improve commit message] Signed-off-by: Artem Bilan <artem.bilan@broadcom.com> (cherry picked from commit 1741803)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We had an issue in our system trying to consume a message from RabbitMQ that contained an
x-deathheader, withcountvalue typed as Integer. This caused a ClassCastException inspring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
Line 150 in 355be1e
The reason the
countvalue was an int and not a long is that we were storing headers in an internal database as part of a recovery process, and the typing was slightly changed during serialisation / deserialisation.We propose this pull request to make the reading process of the
countfield inx-deathheader safer.