[dubbo] branch 3.2 updated: PutAll configs to application environment instead of override for spring properties (#12812)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 97227e4e8e PutAll configs to application environment instead of 
override for spring properties (#12812)
97227e4e8e is described below

commit 97227e4e8e1a877d5356ffccbfd10de78493cd3a
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Sat Jul 29 19:19:43 2023 +0800

    PutAll configs to application environment instead of override for spring 
properties (#12812)
---
 .../config/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 fcd759578e..b54b506e55 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 class DubboInfraBeanRegisterPostProcessor implements 
BeanDefinitionRegist
         // Extract dubbo props from Spring env and put them to app config
         ConfigurableEnvironment environment = (ConfigurableEnvironment) 
applicationContext.getEnvironment();
         SortedMap<String, String> dubboProperties = 
EnvironmentUtils.filterDubboProperties(environment);
-        applicationModel.modelEnvironment().setAppConfigMap(dubboProperties);
+        
applicationModel.modelEnvironment().getAppConfigMap().putAll(dubboProperties);
 
         // register ConfigManager singleton
         beanFactory.registerSingleton(ConfigManager.BEAN_NAME, 
applicationModel.getApplicationConfigManager());