Merge pull request #945 from fangyincheng/fix-object

fix bug
apache · Jan 4, 2021 · 75c693d · 75c693d
1 parent e4eb1f6
commit 75c693d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)