Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-27 09:14:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/duanhf2012/origin

Browse Source
This commit is contained in:
boyce
2020-07-11 15:44:51 +08:00
parent 7b0072bbff a69010c31d
commit 0fd154fc7f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rpc/pbprocessor.go
View File

@@ -32,7 +32,9 @@ func (slf *PBRpcRequestData) MakeRequest(seq uint64,serviceMethod string,noReply
func (slf *PBRpcResponseData) MakeRespone(seq uint64,err *RpcError,reply []byte) *PBRpcResponseData{ func (slf *PBRpcResponseData) MakeRespone(seq uint64,err *RpcError,reply []byte) *PBRpcResponseData{
slf.Seq = proto.Uint64(seq) slf.Seq = proto.Uint64(seq)
slf.Error = proto.String(err.Error()) if err != nil {
slf.Error = proto.String(err.Error())
}
slf.Reply = reply slf.Reply = reply
return slf return slf
@@ -74,6 +76,9 @@ func (slf *PBRpcRequestData) IsNoReply() bool{
} }
func (slf *PBRpcResponseData) GetErr() *RpcError { func (slf *PBRpcResponseData) GetErr() *RpcError {
if slf.GetError() == "" {
return nil
}
return Errorf(slf.GetError()) return Errorf(slf.GetError())
} }