fix unit test

apache · Dec 19, 2023 · bb875e5 · bb875e5
1 parent 508505f
commit bb875e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...overy/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java b/...overy/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/...toconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/CorePropertiesTest.java b/...toconfigure-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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@