From a279e3ca11531c2a8949fed0ceaaa4aa0247788b Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Thu, 16 Jun 2022 16:55:26 -0400
Subject: [PATCH] Tread empty leader id same as null.  Fixes #1037

---
 .../cloud/kubernetes/commons/leader/LeadershipController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeadershipController.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeadershipController.java
index c4d401ea..d616c55a 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeadershipController.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeadershipController.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.integration.leader.Candidate;
 import org.springframework.integration.leader.Context;
 import org.springframework.integration.leader.event.LeaderEventPublisher;
+import org.springframework.util.StringUtils;
 
 /**
  * @author Ryan Baxter
@@ -84,7 +85,7 @@ public abstract class LeadershipController {
 
 		String leaderKey = getLeaderKey();
 		String leaderId = data.get(leaderKey);
-		if (leaderId == null) {
+		if (!StringUtils.hasText(leaderId)) {
 			return null;
 		}