fix: consider null values in ClientContext

diegomarquezp · diegomarquezp · commit b8b18bd927a3 · 2026-03-30T17:14:45.000-04:00
diff --git a/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java
@@ -272,9 +272,10 @@ public static ClientContext create(StubSettings settings) throws IOException {
       backgroundResources.add(watchdog);
     }
     String serviceName = endpointContext.serviceName();
+    String universeDomain = endpointContext.resolvedUniverseDomain();
     String urlDomain = null;
-    if (!Strings.isNullOrEmpty(serviceName)) {
-      urlDomain = serviceName + "." + endpointContext.resolvedUniverseDomain();
+    if (!Strings.isNullOrEmpty(serviceName) && !Strings.isNullOrEmpty(universeDomain)) {
+      urlDomain = serviceName + "." + universeDomain;
     }
 
     ApiTracerContext apiTracerContext =

Original file line number	Diff line number	Diff line change
`@@ -272,9 +272,10 @@ public static ClientContext create(StubSettings settings) throws IOException {`
`272`	`272`	`backgroundResources.add(watchdog);`
`273`	`273`	`}`
`274`	`274`	`String serviceName = endpointContext.serviceName();`
	`275`	`+ String universeDomain = endpointContext.resolvedUniverseDomain();`
`275`	`276`	`String urlDomain = null;`
`276`		`- if (!Strings.isNullOrEmpty(serviceName)) {`
`277`		`- urlDomain = serviceName + "." + endpointContext.resolvedUniverseDomain();`
	`277`	`+ if (!Strings.isNullOrEmpty(serviceName) && !Strings.isNullOrEmpty(universeDomain)) {`
	`278`	`+ urlDomain = serviceName + "." + universeDomain;`
`278`	`279`	`}`
`279`	`280`
`280`	`281`	`ApiTracerContext apiTracerContext =`