Fix using dataids field causes NullPointerException (nacos-group#321)

nailcui · Dec 29, 2023 · eaf15a6 · eaf15a6
1 parent 5a97a9d
commit eaf15a6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...oot-autoconfigure/src/main/java/com/alibaba/boot/nacos/config/util/NacosConfigLoader.java b/...oot-autoconfigure/src/main/java/com/alibaba/boot/nacos/config/util/NacosConfigLoader.java
@@ -23,6 +23,7 @@
 import java.util.ListIterator;
 import java.util.Properties;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import com.alibaba.boot.nacos.config.properties.NacosConfigProperties;
 import com.alibaba.nacos.api.config.ConfigService;
@@ -42,6 +43,7 @@
 
 /**
  * @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
+ * @author <a href="mailto:guofuyinan@gmail.com">guofuyinan</a>
  * @since 0.2.3
  */
 public class NacosConfigLoader {
@@ -113,7 +115,9 @@ private List<NacosPropertySource> reqGlobalNacosConfig(ConfigurableEnvironment e
 			final String ids = environment
 					.resolvePlaceholders(nacosConfigProperties.getDataIds());
 			if(StringUtils.hasText(ids)){
-				dataIds.addAll(Arrays.asList(ids.split(",")));
+				dataIds.addAll(Arrays.stream(ids.split(","))
+						.filter(StringUtils::hasText)
+						.collect(Collectors.toList()));
 			}
 		}
 		else {