cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Fix chan handling

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-03-11 19:14:49 +01:00
parent 8d870a03b5
commit 21b34ba133
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jsonrpc/handler.go
View File

@ -230,7 +230,13 @@ func (h handlers) handle(ctx context.Context, req request, w func(func(io.Writer
} }
} }
} }
if resp.Result != nil && reflect.TypeOf(resp.Result).Kind() == reflect.Chan {
var res interface{}
if handler.valOut != -1 {
res = callResult[handler.valOut].Interface()
}
if res != nil && reflect.TypeOf(res).Kind() == reflect.Chan {
// Channel responses are sent from channel control goroutine. // Channel responses are sent from channel control goroutine.
// Sending responses here could cause deadlocks on writeLk, or allow // Sending responses here could cause deadlocks on writeLk, or allow
// sending channel messages before this rpc call returns // sending channel messages before this rpc call returns
@ -250,8 +256,8 @@ func (h handlers) handle(ctx context.Context, req request, w func(func(io.Writer
} }
// check error as JSON-RPC spec prohibits error and value at the same time // check error as JSON-RPC spec prohibits error and value at the same time
if resp.Error == nil && handler.valOut != -1 { if resp.Error == nil {
resp.Result = callResult[handler.valOut].Interface() resp.Result = res
} }
w(func(w io.Writer) { w(func(w io.Writer) {