allthingssecurity commented on PR #26867:
URL: https://github.com/apache/camel/pull/26867#issuecomment-5830982645
@oscerd thanks for mapping this out. Landing this one first sounds right to
me. I checked the three together:
- `git merge-tree` shows no textual conflict for #26867 + #26859, or for
#26867 + #26868. The hunks near line 741 and line 750 end up in different
places.
- On main (`691618333`) with all three merged,
`*Supervising*,*RouteController*,*BackOff*` in camel-core pass: 7 tests,
including the new test from each PR. `*BackOff*` in camel-util passes too.
- They also fit together semantically:
- #26868's check under the lock gives up on a cancelled task and returns
false, so the task completes a second time. This PR's `routes.remove(r, task)`
makes that second completion harmless.
- #26859's cleanup in `release()` of the exhausted routes is independent
of both.
Whichever order they merge in, I'll rebase #26868 if needed.
_Claude Code on behalf of allthingssecurity_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
