netty: Run handshakeCompleteRunnable in success cases

rmehta19 · web-flow · commit 283f1031f7b4 · 2025-12-05T15:36:14.000-08:00
b/458734698
diff --git a/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java b/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
@@ -702,9 +702,6 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws
             Exception ex =
                 unavailableException("Failed ALPN negotiation: Unable to find compatible protocol");
             logSslEngineDetails(Level.FINE, ctx, "TLS negotiation failed.", ex);
-            if (handshakeCompleteRunnable.isPresent()) {
-              handshakeCompleteRunnable.get().run();
-            }
             ctx.fireExceptionCaught(ex);
           }
         } else {
@@ -719,11 +716,11 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws
                 .withCause(t)
                 .asRuntimeException();
           }
-          if (handshakeCompleteRunnable.isPresent()) {
-            handshakeCompleteRunnable.get().run();
-          }
           ctx.fireExceptionCaught(t);
         }
+        if (handshakeCompleteRunnable.isPresent()) {
+          handshakeCompleteRunnable.get().run();
+        }
       } else {
         super.userEventTriggered0(ctx, evt);
       }

Original file line number	Diff line number	Diff line change
`@@ -702,9 +702,6 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws`
`702`	`702`	`Exception ex =`
`703`	`703`	`unavailableException("Failed ALPN negotiation: Unable to find compatible protocol");`
`704`	`704`	`logSslEngineDetails(Level.FINE, ctx, "TLS negotiation failed.", ex);`
`705`		`- if (handshakeCompleteRunnable.isPresent()) {`
`706`		`- handshakeCompleteRunnable.get().run();`
`707`		`- }`
`708`	`705`	`ctx.fireExceptionCaught(ex);`
`709`	`706`	`}`
`710`	`707`	`} else {`
`@@ -719,11 +716,11 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws`
`719`	`716`	`.withCause(t)`
`720`	`717`	`.asRuntimeException();`
`721`	`718`	`}`
`722`		`- if (handshakeCompleteRunnable.isPresent()) {`
`723`		`- handshakeCompleteRunnable.get().run();`
`724`		`- }`
`725`	`719`	`ctx.fireExceptionCaught(t);`
`726`	`720`	`}`
	`721`	`+ if (handshakeCompleteRunnable.isPresent()) {`
	`722`	`+ handshakeCompleteRunnable.get().run();`
	`723`	`+ }`
`727`	`724`	`} else {`
`728`	`725`	`super.userEventTriggered0(ctx, evt);`
`729`	`726`	`}`