Auto-port 5.0: ChannelInitializer: correct misleading comment on exceptionCaught route#16854
Merged
Conversation
…te (#16847) Motivation: The catch block in `ChannelInitializer.initChannel(ChannelHandlerContext)` currently attributes the explicit `exceptionCaught(...)` call to two reasons that don't match the current code: ```java } catch (Throwable cause) { // Explicitly call exceptionCaught(...) as we removed the handler before calling initChannel(...). // We do so to prevent multiple calls to initChannel(...). exceptionCaught(ctx, cause); } finally { if (!ctx.isRemoved()) { ctx.pipeline().remove(this); } } ``` - The handler is **not** removed before `initChannel(...)` is called — removal happens in the `finally` block immediately below. - Re-entrance is guarded by the `initMap.add(ctx)` check at the top of the method, **not** by this catch block. Both clauses of the comment mislead a reader trying to understand why the catch block exists. Modification: Rewrite the two-line comment to name the actual mechanisms: - the `exceptionCaught(...)` call routes the failure into the pipeline; - re-entrance is guarded by `initMap.add(ctx)` above; - handler removal happens in the `finally` block below. No code change. Result: Future readers of `initChannel(ChannelHandlerContext)` can trust the comment instead of having to cross-check it against the surrounding code. Fixes #16846. The same wording exists on 4.1, 4.2, and 5.0; targeting 4.1 so auto-port carries it forward. (cherry picked from commit 22d1be6)
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.
Auto-port of #16847 to 5.0
Cherry-picked commit: 22d1be6
Motivation:
The catch block in
ChannelInitializer.initChannel(ChannelHandlerContext)currently attributes the explicitexceptionCaught(...)call to two reasons that don't match the current code:initChannel(...)is called — removal happens in thefinallyblock immediately below.initMap.add(ctx)check at the top of the method, not by this catch block.Both clauses of the comment mislead a reader trying to understand why the catch block exists.
Modification:
Rewrite the two-line comment to name the actual mechanisms:
exceptionCaught(...)call routes the failure into the pipeline;initMap.add(ctx)above;finallyblock below.No code change.
Result:
Future readers of
initChannel(ChannelHandlerContext)can trust the comment instead of having to cross-check it against the surrounding code.Fixes #16846.
The same wording exists on 4.1, 4.2, and 5.0; targeting 4.1 so auto-port carries it forward.