[GitHub] chickenlj closed pull request #2381: [Dubbo-1814][Baiji-7] fix the issue #1814

[GitBox <gi...@apache.org>]

chickenlj closed pull request #2381: [Dubbo-1814][Baiji-7] fix the issue #1814
URL: https://github.com/apache/incubator-dubbo/pull/2381
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
index 5b41b247c8..d10f878dcb 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
@@ -25,6 +25,7 @@
 import org.apache.dubbo.config.ServiceConfig;
 import org.apache.dubbo.config.annotation.Service;
 import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
+import org.apache.dubbo.config.spring.util.SpringConfigUtils;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.BeanNameAware;
@@ -80,6 +81,7 @@ public void setApplicationContext(ApplicationContext applicationContext) {
         SpringExtensionFactory.addApplicationContext(applicationContext);
         if (applicationContext != null) {
             SPRING_CONTEXT = applicationContext;
+            SpringConfigUtils.setDubboSpringConfig(applicationContext);
             try {
                 Method method = applicationContext.getClass().getMethod("addApplicationListener", ApplicationListener.class); // backward compatibility to spring 2.0.1
                 method.invoke(applicationContext, this);
@@ -280,4 +282,5 @@ protected Class getServiceClass(T ref) {
         }
         return super.getServiceClass(ref);
     }
+
 }
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/SpringConfigUtils.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/SpringConfigUtils.java
new file mode 100644
index 0000000000..b43ee09d4b
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/SpringConfigUtils.java
@@ -0,0 +1,29 @@
+package org.apache.dubbo.config.spring.util;
+
+import org.apache.dubbo.common.utils.ConfigUtils;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.springframework.context.ApplicationContext;
+
+import java.util.Map;
+import java.util.Properties;
+
+public class SpringConfigUtils {
+
+    public static void setDubboSpringConfig(ApplicationContext applicationContext) {
+        if (applicationContext == null) {
+            return;
+        }
+
+        ApplicationConfig applicationConfig = applicationContext.getBean(ApplicationConfig.class);
+        if (applicationConfig == null || applicationConfig.getParameters() == null) {
+            return;
+        }
+
+        Properties properties = ConfigUtils.getProperties();
+        for (Map.Entry<String, String> entry: applicationConfig.getParameters().entrySet()) {
+            if (entry.getValue() != null && entry.getValue().trim().length() > 0) {
+                properties.put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org