Skip to content

Commit

Permalink
Merge pull request #945 from fangyincheng/fix-object
Browse files Browse the repository at this point in the history
fix bug
  • Loading branch information
AlexStocks authored Dec 20, 2020
2 parents 7497842 + 6e8b0f5 commit 2415f0f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ install: true

# define ci-stage
script:
- go fmt ./... && [[ -z `git status -s` ]]
# license-check
- make verify
# integrate-test
Expand Down
1 change: 0 additions & 1 deletion cluster/router/healthcheck/default_health_check.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions protocol/dubbo/impl/hessian.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ import (
"github.com/apache/dubbo-go/common/logger"
)

type Object interface{}

type HessianSerializer struct {
}

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion registry/zookeeper/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2415f0f

Please sign in to comment.