From 16701e66e18872c0a4c315e4b9c6cb1e39efedd4 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Sat, 29 Jul 2023 15:30:20 +0800 Subject: [PATCH] PutAll configs to application environment instead of override for spring properties --- .../spring/context/DubboInfraBeanRegisterPostProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java index fcd759578e6..b54b506e551 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java @@ -85,7 +85,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) // Extract dubbo props from Spring env and put them to app config ConfigurableEnvironment environment = (ConfigurableEnvironment) applicationContext.getEnvironment(); SortedMap dubboProperties = EnvironmentUtils.filterDubboProperties(environment); - applicationModel.modelEnvironment().setAppConfigMap(dubboProperties); + applicationModel.modelEnvironment().getAppConfigMap().putAll(dubboProperties); // register ConfigManager singleton beanFactory.registerSingleton(ConfigManager.BEAN_NAME, applicationModel.getApplicationConfigManager());