You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2019/10/30 06:39:45 UTC
[dubbo-spring-boot-project] branch master updated: fix placeholder
resolve error when use both xml and annotation config (#579)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new d945b9f fix placeholder resolve error when use both xml and annotation config (#579)
d945b9f is described below
commit d945b9fcbfa2528c4168613c990c208c7d927ca3
Author: Taosheng Wei <ts...@apache.org>
AuthorDate: Wed Oct 30 14:39:39 2019 +0800
fix placeholder resolve error when use both xml and annotation config (#579)
* fix placeholder resolve error when use both xml and annotation configuration
* fix placeholder resolve error when use both xml and annotation configuration
---
.../src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java
index 2e796b1..286f442 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java
@@ -189,13 +189,12 @@ public abstract class DubboUtils {
if (propertyName.startsWith(DUBBO_PREFIX + PROPERTY_NAME_SEPARATOR)
&& entry.getValue() != null) {
- dubboProperties.put(propertyName, entry.getValue().toString());
+ dubboProperties.put(propertyName, environment.resolvePlaceholders(entry.getValue().toString()));
}
}
return Collections.unmodifiableSortedMap(dubboProperties);
-
}
}