commons_go/rpc
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2017-11-01 17:13:23 +09:00
parent 74ba963ea9
commit 5cad5b126d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/json/client.go
View File

@ -110,8 +110,8 @@ func newClientCodecResponseOrNotify(r io.Reader, encoder encode.Encoder) (protoc
ccrn := retainClientCodecResponseOrNotify() ccrn := retainClientCodecResponseOrNotify()
if res, err := newClientCodecResponse(raw, dec); nil != err { if res, err := newClientCodecResponse(raw); nil != err {
notify, err := newClientCodecNotify(raw, dec) notify, err := newClientCodecNotify(raw)
if nil != err { if nil != err {
releaseClientCodecResponseOrNotify(ccrn) releaseClientCodecResponseOrNotify(ccrn)
return nil, fmt.Errorf("Is not response or notification [%v]", raw) return nil, fmt.Errorf("Is not response or notification [%v]", raw)

4
protocol/json/client_notify.go
View File

@ -13,10 +13,10 @@ import (
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// newCodecRequest returns a new ClientCodecNotify. // newCodecRequest returns a new ClientCodecNotify.
func newClientCodecNotify(raw json.RawMessage, decoder *json.Decoder) (protocol.ClientCodecNotify, error) { func newClientCodecNotify(raw json.RawMessage) (protocol.ClientCodecNotify, error) {
// Decode the request body and check if RPC method is valid. // Decode the request body and check if RPC method is valid.
ccn := retainClientCodecNotify() ccn := retainClientCodecNotify()
err := decoder.Decode(&ccn.notify) err := json.Unmarshal(raw, &ccn.notify)
if err != nil { if err != nil {
releaseClientCodecNotify(ccn) releaseClientCodecNotify(ccn)
return nil, err return nil, err

4
protocol/json/client_response.go
View File

@ -13,10 +13,10 @@ import (
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// newClientCodecResponse returns a new ClientCodecResponse. // newClientCodecResponse returns a new ClientCodecResponse.
func newClientCodecResponse(raw json.RawMessage, decoder *json.Decoder) (protocol.ClientCodecResponse, error) { func newClientCodecResponse(raw json.RawMessage) (protocol.ClientCodecResponse, error) {
// Decode the request body and check if RPC method is valid. // Decode the request body and check if RPC method is valid.
ccr := retainClientCodecResponse() ccr := retainClientCodecResponse()
err := decoder.Decode(&ccr.response) err := json.Unmarshal(raw, &ccr.response)
if err != nil { if err != nil {
releaseClientCodecResponse(ccr) releaseClientCodecResponse(ccr)
return nil, err return nil, err