Skip to content

netty: Run handshakeCompleteRunnable in success cases #12514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

netty: Run handshakeCompleteRunnable in success cases #12514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,9 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws
// Successfully negotiated the protocol.
logSslEngineDetails(Level.FINER, ctx, "TLS negotiation succeeded.", null);
propagateTlsComplete(ctx, handler.engine().getSession());
if (handshakeCompleteRunnable.isPresent()) {
Copy link
Member

@ejona86 ejona86 Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason not to have a single copy of the code within the evt instanceof SslHandshakeCompletionEvent block?

handshakeCompleteRunnable.get().run();
}
} else {
Exception ex =
unavailableException("Failed ALPN negotiation: Unable to find compatible protocol");
Expand Down Expand Up @@ -725,6 +728,9 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws
ctx.fireExceptionCaught(t);
}
} else {
if (handshakeCompleteRunnable.isPresent()) {
Copy link
Member

@ejona86 ejona86 Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete. We have no clue what this event was; it could be anything.

handshakeCompleteRunnable.get().run();
}
super.userEventTriggered0(ctx, evt);
}
}
Expand Down