From bb875e50ac706601cbbe8685df67db0c56aea3db Mon Sep 17 00:00:00 2001
From: laywin <laywin@yeah.net>
Date: Tue, 19 Dec 2023 16:23:44 +0800
Subject: [PATCH] fix unit test

---
 .../io/seata/discovery/registry/RegistryService.java     | 9 ++++++---
 .../spring/boot/autoconfigure/CorePropertiesTest.java    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
index dbec4e7ea62..b56f751d8f9 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
@@ -29,6 +29,7 @@
 
 import io.seata.common.ConfigurationKeys;
 import io.seata.common.util.CollectionUtils;
+import io.seata.common.util.StringUtils;
 import io.seata.config.ConfigurationCache;
 import io.seata.config.ConfigurationFactory;
 
@@ -153,9 +154,11 @@ default void removeOfflineAddressesIfNecessary(String clusterName, Collection<In
         // empty addresses && currentClusterName == clusterName, enable push empty protection
         if (CollectionUtils.isEmpty(inetSocketAddresses)) {
             String txServiceGroupName = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.TX_SERVICE_GROUP);
-            String currentClusterName = getServiceGroup(txServiceGroupName);
-            if (Objects.equals(currentClusterName, clusterName)) {
-                return;
+            if (StringUtils.isNotBlank(txServiceGroupName)) {
+                String currentClusterName = getServiceGroup(txServiceGroupName);
+                if (Objects.equals(currentClusterName, clusterName)) {
+                    return;
+                }
             }
         }
 
diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/CorePropertiesTest.java b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/CorePropertiesTest.java
index 1570bae18dd..50e57e7964a 100644
--- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/CorePropertiesTest.java
+++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/CorePropertiesTest.java
@@ -75,7 +75,7 @@ public void testTransportProperties() {
 
     @Test
     public void testShutdownProperties() {
-        assertEquals(3L, context.getBean(ShutdownProperties.class).getWait());
+        assertEquals(13L, context.getBean(ShutdownProperties.class).getWait());
     }
 
     @Test