This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch 1.5.5 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 75c693d3c0d589bc16497074435f578d7a19405d Author: Xin.Zh <[email protected]> AuthorDate: Sun Dec 20 22:27:18 2020 +0800 Merge pull request #945 from fangyincheng/fix-object fix bug --- .travis.yml | 1 + cluster/router/healthcheck/default_health_check.go | 1 - protocol/dubbo/impl/hessian.go | 4 +--- registry/zookeeper/registry.go | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b338c2..4f79ecf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ install: true # define ci-stage script: + - go fmt ./... && [[ -z `git status -s` ]] # license-check - make verify # integrate-test diff --git a/cluster/router/healthcheck/default_health_check.go b/cluster/router/healthcheck/default_health_check.go index 3effd77..378463b 100644 --- a/cluster/router/healthcheck/default_health_check.go +++ b/cluster/router/healthcheck/default_health_check.go @@ -96,7 +96,6 @@ func (c *DefaultHealthChecker) getCircuitBreakerSleepWindowTime(status *protocol return int64(sleepWindow) } - // GetRequestSuccessiveFailureThreshold return the requestSuccessiveFailureThreshold bound to this DefaultHealthChecker func (c *DefaultHealthChecker) GetRequestSuccessiveFailureThreshold() int32 { return c.requestSuccessiveFailureThreshold diff --git a/protocol/dubbo/impl/hessian.go b/protocol/dubbo/impl/hessian.go index 066400d..9f23d36 100644 --- a/protocol/dubbo/impl/hessian.go +++ b/protocol/dubbo/impl/hessian.go @@ -37,8 +37,6 @@ import ( "github.com/apache/dubbo-go/common/logger" ) -type Object interface{} - type HessianSerializer struct { } @@ -474,7 +472,7 @@ func getArgType(v interface{}) string { return "java.lang.String" case []string: return "[Ljava.lang.String;" - case []Object: + case []hessian.Object: return "[Ljava.lang.Object;" case map[interface{}]interface{}: // return "java.util.HashMap" diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 76fc052..fe492c2 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -212,7 +212,7 @@ func (r *zkRegistry) registerTempZookeeperNode(root string, node string) error { r.cltLock.Lock() defer r.cltLock.Unlock() - if r.client == nil{ + if r.client == nil { return perrors.WithStack(perrors.New("zk client already been closed")) } err = r.client.Create(root)
