fix: Only send mtlsEndpoint if it is non-null

lqiu96 · lqiu96 · commit feac5e5627a7 · 2025-04-28T17:55:28.000-04:00
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java
@@ -223,7 +223,7 @@ public static ClientContext create(StubSettings settings) throws IOException {
       transportChannelProvider = transportChannelProvider.withEndpoint(endpoint);
     }
     transportChannelProvider = transportChannelProvider.withUseS2A(endpointContext.useS2A());
-    if (transportChannelProvider.needsMtlsEndpoint()) {
+    if (transportChannelProvider.needsMtlsEndpoint() && endpointContext.mtlsEndpoint() != null) {
       transportChannelProvider =
           transportChannelProvider.withMtlsEndpoint(endpointContext.mtlsEndpoint());
     }

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ public static ClientContext create(StubSettings settings) throws IOException {`
`223`	`223`	`transportChannelProvider = transportChannelProvider.withEndpoint(endpoint);`
`224`	`224`	`}`
`225`	`225`	`transportChannelProvider = transportChannelProvider.withUseS2A(endpointContext.useS2A());`
`226`		`- if (transportChannelProvider.needsMtlsEndpoint()) {`
	`226`	`+ if (transportChannelProvider.needsMtlsEndpoint() && endpointContext.mtlsEndpoint() != null) {`
`227`	`227`	`transportChannelProvider =`
`228`	`228`	`transportChannelProvider.withMtlsEndpoint(endpointContext.mtlsEndpoint());`
`229`	`229`	`}`