From 331b5235137e699c778f4768638728da7d891d9b Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Thu, 28 Oct 2021 19:43:27 +0200
Subject: [PATCH] Handle null serviceId. (#1034)

---
 .../cloud/loadbalancer/support/LoadBalancerClientFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java
index d2cd4442..5fb40fdd 100644
--- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java
+++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java
@@ -82,7 +82,7 @@ public class LoadBalancerClientFactory extends NamedContextFactory<LoadBalancerC
 			}
 			return null;
 		}
-		if (!properties.getClients().containsKey(serviceId)) {
+		if (serviceId == null || !properties.getClients().containsKey(serviceId)) {
 			// no specific client properties, return default
 			return properties;
 		}