From 08dea8118ba9cef853c49fc07184bac5cf19336c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=BC=E5=8D=8E?= <43363120+BurningCN@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:53:35 +0800 Subject: [PATCH] Fix the problem that NPE may appear in ReferenceBeanSupport#convertToString method (#9693) --- .../apache/dubbo/config/spring/util/DubboAnnotationUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java index baed5e41cf..132990e588 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java @@ -27,6 +27,7 @@ import org.springframework.util.Assert; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -154,7 +155,7 @@ public class DubboAnnotationUtils { */ public static Map convertParameters(String[] parameters) { if (ArrayUtils.isEmpty(parameters)) { - return null; + return Collections.emptyMap(); } List compatibleParameterArray = Arrays.stream(parameters)