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 2019/01/09 11:57:01 UTC
[incubator-dubbo] 02/02: Keep parameters in registry url.
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
commit c89807ead3ce4ad58461e72ad9aef8ec75e638c3
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Jan 9 19:56:36 2019 +0800
Keep parameters in registry url.
---
.../java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java | 2 +-
.../java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
index 54ce826..c6a01e8 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -64,7 +64,7 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
if (url.getProtocol().equals(Constants.REGISTRY_PROTOCOL)) {
Map<String, String> queryMap = StringUtils.parseQueryString(url.getParameterAndDecoded(Constants.REFER_KEY));
- this.url = url.clearParameters().addParameters(queryMap).removeParameter(Constants.MONITOR_KEY);
+ this.url = url.addParameters(queryMap).removeParameter(Constants.MONITOR_KEY);
} else {
this.url = url;
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
index e868bd7..385fa10 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
@@ -96,7 +96,6 @@ public class StaticDirectory<T> extends AbstractDirectory<T> {
List<Invoker<T>> finalInvokers = invokers;
if (routerChain != null) {
try {
- // Get invokers from cache, only runtime routers will be executed.
finalInvokers = routerChain.route(getConsumerUrl(), invocation);
} catch (Throwable t) {
logger.error("Failed to execute router: " + getUrl() + ", cause: " + t.getMessage(), t);