From e7c791369a08c747d06699c85ae6373ea47d5a9e Mon Sep 17 00:00:00 2001 From: deadEternally Date: Fri, 21 Feb 2025 15:24:23 +0530 Subject: [PATCH] Fix test and some mistakes. --- netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java | 2 +- netty/src/main/java/io/grpc/netty/X509AuthorityVerifier.java | 2 +- netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java index 6253656e3ee..aabcd4fbaaa 100644 --- a/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java +++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java @@ -69,7 +69,7 @@ private GrpcHttp2OutboundHeaders(AsciiString[] preHeaders, byte[][] serializedMe @Override public CharSequence authority() { for (int i = 0; i < preHeaders.length / 2; i++) { - if (preHeaders[i].equals(Http2Headers.PseudoHeaderName.AUTHORITY.value())) { + if (preHeaders[i * 2].equals(Http2Headers.PseudoHeaderName.AUTHORITY.value())) { return preHeaders[i * 2 + 1]; } } diff --git a/netty/src/main/java/io/grpc/netty/X509AuthorityVerifier.java b/netty/src/main/java/io/grpc/netty/X509AuthorityVerifier.java index 8771d333b31..8a8d426662f 100644 --- a/netty/src/main/java/io/grpc/netty/X509AuthorityVerifier.java +++ b/netty/src/main/java/io/grpc/netty/X509AuthorityVerifier.java @@ -53,7 +53,7 @@ final class X509AuthorityVerifier implements AuthorityVerifier { } public X509AuthorityVerifier(SSLEngine sslEngine, X509TrustManager x509ExtendedTrustManager) { - this.sslEngine = checkNotNull(sslEngine); + this.sslEngine = checkNotNull(sslEngine, "sslEngine"); this.x509ExtendedTrustManager = x509ExtendedTrustManager; } diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java index 488b2f381e7..9b3b2e386d3 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java @@ -887,7 +887,7 @@ public void authorityOverrideInCallOptions_noX509ExtendedTrustManager_newStreamC } catch (ExecutionException ex) { Status status = ((StatusException) ex.getCause()).getStatus(); assertThat(status.getDescription()).isEqualTo("Can't allow authority override in rpc " - + "when SslEngine or X509ExtendedTrustManager is not available"); + + "when X509ExtendedTrustManager is not available"); assertThat(status.getCode()).isEqualTo(Code.UNAVAILABLE); } } finally {