From 84c39a30bf1c02c489a4af88b63e789c4e3b55fe Mon Sep 17 00:00:00 2001
From: aliiohs <rzy1107@163.com>
Date: Fri, 6 Sep 2019 22:58:38 +0800
Subject: [PATCH] fix
---
cluster/cluster_impl/failover_cluster_invoker.go | 4 ++--
cluster/cluster_impl/registry_aware_cluster_invoker.go | 2 +-
cluster/directory/static_directory_test.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cluster/cluster_impl/failover_cluster_invoker.go b/cluster/cluster_impl/failover_cluster_invoker.go
index 50519f5d3..23de1ee63 100644
--- a/cluster/cluster_impl/failover_cluster_invoker.go
+++ b/cluster/cluster_impl/failover_cluster_invoker.go
@@ -40,7 +40,7 @@ func newFailoverClusterInvoker(directory cluster.Directory) protocol.Invoker {
func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) protocol.Result {
- invokers, _ := invoker.directory.List(invocation)
+ invokers := invoker.directory.List(invocation)
err := invoker.checkInvokers(invokers, invocation)
if err != nil {
@@ -70,7 +70,7 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr
if err != nil {
return &protocol.RPCResult{Err: err}
}
- invokers, _ = invoker.directory.List(invocation)
+ invokers := invoker.directory.List(invocation)
err = invoker.checkInvokers(invokers, invocation)
if err != nil {
return &protocol.RPCResult{Err: err}
diff --git a/cluster/cluster_impl/registry_aware_cluster_invoker.go b/cluster/cluster_impl/registry_aware_cluster_invoker.go
index 028918568..5785c0248 100644
--- a/cluster/cluster_impl/registry_aware_cluster_invoker.go
+++ b/cluster/cluster_impl/registry_aware_cluster_invoker.go
@@ -34,7 +34,7 @@ func newRegistryAwareClusterInvoker(directory cluster.Directory) protocol.Invoke
}
func (invoker *registryAwareClusterInvoker) Invoke(invocation protocol.Invocation) protocol.Result {
- invokers, _ := invoker.directory.List(invocation)
+ invokers := invoker.directory.List(invocation)
//First, pick the invoker (XXXClusterInvoker) that comes from the local registry, distinguish by a 'default' key.
for _, invoker := range invokers {
if invoker.IsAvailable() && invoker.GetUrl().GetParam(constant.REGISTRY_DEFAULT_KEY, "false") == "true" {
diff --git a/cluster/directory/static_directory_test.go b/cluster/directory/static_directory_test.go
index 76beebc94..89d0e24ee 100644
--- a/cluster/directory/static_directory_test.go
+++ b/cluster/directory/static_directory_test.go
@@ -41,7 +41,7 @@ func Test_StaticDirList(t *testing.T) {
}
staticDir := NewStaticDirectory(invokers)
- list, _ := staticDir.List(&invocation.RPCInvocation{})
+ list := staticDir.List(&invocation.RPCInvocation{})
assert.Len(t, list, 10)
}
--
GitLab