You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2022/02/28 04:12:22 UTC
[dubbo] branch 3.0 updated: Revert "Fixe the issue that the default protocol configured by the consumer does not take effect in the application-level mode (#9683)" (#9727)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 5c9287f Revert "Fixe the issue that the default protocol configured by the consumer does not take effect in the application-level mode (#9683)" (#9727)
5c9287f is described below
commit 5c9287f92a5d940b69b9ae38c28bb9ddf8641705
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Feb 28 12:11:52 2022 +0800
Revert "Fixe the issue that the default protocol configured by the consumer does not take effect in the application-level mode (#9683)" (#9727)
This reverts commit eed418a96d2b822e793ae428684f9f0a3d069e45.
---
.../main/java/org/apache/dubbo/config/ReferenceConfigBase.java | 10 ----------
.../src/main/java/org/apache/dubbo/config/ReferenceConfig.java | 2 --
2 files changed, 12 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
index fe90258..f60f5d0 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.config;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.ClassUtils;
-import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.RegexProperties;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.annotation.Reference;
@@ -160,15 +159,6 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
return metaData;
}
- protected void checkProtocol() {
- if (StringUtils.isEmpty(protocol)) {
- List<ProtocolConfig> defaultProtocols = getConfigManager().getDefaultProtocols();
- if (CollectionUtils.isNotEmpty(defaultProtocols)) {
- protocol = defaultProtocols.iterator().next().getName();
- }
- }
- }
-
/**
* Get service interface class of this reference.
* The actual service type of remote provider.
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index c73b1de..539e6d6 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -557,8 +557,6 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
// get consumer's global configuration
completeCompoundConfigs();
- checkProtocol();
-
// init some null configuration.
List<ConfigInitializer> configInitializers = this.getExtensionLoader(ConfigInitializer.class)
.getActivateExtension(URL.valueOf("configInitializer://"), (String[]) null);