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 2020/03/12 03:37:50 UTC
[dubbo] branch 2.7.6-release updated: Fix merge does not work.
(#5848)
This is an automated email from the ASF dual-hosted git repository.
liujieqin pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.6-release by this push:
new 8449017 Fix merge does not work. (#5848)
8449017 is described below
commit 84490177d801ced1a83af125251dbc7fe2447902
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Mar 12 11:37:30 2020 +0800
Fix merge does not work. (#5848)
* fix merge does not work
---
.../apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
index babc1d5..3f777e1 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster.support;
-import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
@@ -71,7 +70,7 @@ public class MergeableClusterInvoker<T> extends AbstractClusterInvoker<T> {
return invoker.invoke(invocation);
} catch (RpcException e) {
if (e.isNoInvokerAvailableAfterFilter()) {
- log.debug("No available provider for service" + directory.getUrl().getServiceKey() + " on group " + invoker.getUrl().getParameter(GROUP_KEY) + ", will continue to try another group.");
+ log.debug("No available provider for service" + getUrl().getServiceKey() + " on group " + invoker.getUrl().getParameter(GROUP_KEY) + ", will continue to try another group.");
} else {
throw e;
}
@@ -181,11 +180,6 @@ public class MergeableClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
@Override
- public URL getUrl() {
- return directory.getUrl();
- }
-
- @Override
public boolean isAvailable() {
return directory.isAvailable();
}