CAMEL-23494: Do not set preparingShutdown flag during suspend (backport 4.18.x)#23182
Merged
Merged
Conversation
The preparingShutdown flag should only be set during a real shutdown, not during a suspend (which is temporary and followed by resume). Skip setting the flag when suspendOnly=true in prepareShutdown() on RedeliveryErrorHandler and both TransactionErrorHandler implementations.
davsclaus
approved these changes
May 13, 2026
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
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.
Summary
Backport of #23179 to
camel-4.18.x.preparingShutdown = trueinprepareShutdown()whensuspendOnly = true, preventing silent transaction rollback and redelivery suppression after suspend/resumeRedeliveryErrorHandlerandcamel-jtaTransactionErrorHandlercamel-springTransactionErrorHandleron 4.18.x does not overrideprepareShutdown(), so the fix inRedeliveryErrorHandler(its parent) is sufficientTest plan
RedeliveryErrorHandlerSuspendResumeTest(camel-core) — passesTransactionErrorHandlerSuspendResumeTest(camel-jta) — passesTransactionalClientDataSourceSuspendResumeTest(camel-spring-xml) — cannot build locally due to pre-existingjaxb2-maven-pluginschemagen issue on this branch/JDK; CI will validateClaude Code on behalf of Federico Mariani