Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-03 22:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复RPC附加原始参数解析错误出错时直接错误返回

Browse Source
This commit is contained in:
boyce
2020-09-25 19:50:23 +08:00
parent 7b24350c7d
commit 8597d1c96e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
network/processor/pbprocessor.go
View File

@@ -92,7 +92,7 @@ func (slf *PBProcessor ) Marshal(msg interface{}) ([]byte, error){
var err error var err error
if pMsg.msg!=nil { if pMsg.msg!=nil {
pMsg.rawMsg,err = proto.Marshal(pMsg.msg.(proto.Message)) pMsg.rawMsg,err = proto.Marshal(pMsg.msg)
if err != nil { if err != nil {
return nil,err return nil,err
} }

2
rpc/rpchandler.go
View File

@@ -245,6 +245,7 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
if request.requestHandle!=nil { if request.requestHandle!=nil {
request.requestHandle(nil, rerr) request.requestHandle(nil, rerr)
} }
return
} }
}else { }else {
if request.localRawParam!=nil { if request.localRawParam!=nil {
@@ -255,6 +256,7 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
if request.requestHandle!=nil { if request.requestHandle!=nil {
request.requestHandle(nil, rerr) request.requestHandle(nil, rerr)
} }
return
} }
}else { }else {
iparam = request.localParam iparam = request.localParam