This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new b725826 set literal 'protocol' for ReferenceBean
b725826 is described below
commit b725826cb6559eb670de67385bc3074b5ede5c97
Author: ken.lj <[email protected]>
AuthorDate: Wed Jan 9 21:08:27 2019 +0800
set literal 'protocol' for ReferenceBean
---
.../apache/dubbo/config/context/ConfigManager.java | 36 +++++++++++-----------
.../spring/schema/DubboBeanDefinitionParser.java | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index aa760be..ae16ef9 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -44,24 +44,24 @@ import static org.apache.dubbo.common.Constants.DEFAULT_KEY;
* Maybe we can consider open to end user in the following version by
providing a fluent style builder.
*
* <pre>{@code
- * public void class DubboBuilder() {
- *
- * public static DubboBuilder create() {
- * return new DubboBuilder();
- * }
- *
- * public DubboBuilder application(ApplicationConfig application) {
- * ConfigManager.getInstance().addApplication(application);
- * return this;
- * }
- *
- * ...
- *
- * public void build() {
- * // export all ServiceConfigs
- * // refer all ReferenceConfigs
- * }
- * }
+ * public void class DubboBuilder() {
+ *
+ * public static DubboBuilder create() {
+ * return new DubboBuilder();
+ * }
+ *
+ * public DubboBuilder application(ApplicationConfig application) {
+ * ConfigManager.getInstance().addApplication(application);
+ * return this;
+ * }
+ *
+ * ...
+ *
+ * public void build() {
+ * // export all ServiceConfigs
+ * // refer all ReferenceConfigs
+ * }
+ * }
* }
* </pre>
* </p>
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 9426f70..9defb05 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -165,7 +165,7 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
RegistryConfig registryConfig = new
RegistryConfig();
registryConfig.setAddress(RegistryConfig.NO_AVAILABLE);
beanDefinition.getPropertyValues().addPropertyValue(beanProperty,
registryConfig);
- } else if ("provider".equals(property) ||
"protocol".equals(property) || "registry".equals(property)) {
+ } else if ("provider".equals(property) ||
"registry".equals(property) || ("protocol".equals(property) &&
ServiceBean.class.equals(beanClass))) {
/**
* For 'provider' 'protocol' 'registry', keep
literal value (should be id/name) and set the value to 'registryIds'
'providerIds' protocolIds'
* The following process should make sure each
id refers to the corresponding instance, here's how to find the instance for
different use cases:
