CAMEL-23385: Fix watch mode exit and terminal resource leak#23130
Merged
Conversation
- Remove shadowed local variable in ActionWatchCommand.doCall() that prevented the watch loop from exiting when the user presses Enter - Set running flag to false in CamelRouteDiagramAction.waitForUserEnter() after lineReader.readLine() returns - Close terminal in finally block to prevent resource leak Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Contributor
|
🧪 CI tested the following changed modules:
💡 Manual integration tests recommended:
All tested modules (6 modules)
|
davsclaus
approved these changes
May 12, 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
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.
CAMEL-23385
Follow-up to #23121 — fixes three bugs introduced in the watch mode implementation:
Shadowed
runningvariable prevents watch exit:ActionWatchCommand.doCall()declared a localAtomicBoolean runningthat shadowed the field. ThewaitForUserEnter()method set the field to false, but the loop checked the local — so pressing Enter could never exit the watch loop.CamelRouteDiagramAction.waitForUserEnter()never signals stop: The override read a line fromlineReaderbut never calledrunning.set(false), so even without the shadowing bug, the loop would continue after the user pressed Enter.Terminal resource leak: The terminal opened in
doCall()was stored as a field but never closed. Wrapped in try/finally to ensure cleanup.