forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mobile: fixed crash on closing error channels

Browse source
This commit is contained in:
Eugene Valeyev 2018-01-18 17:53:17 +03:00
parent 9b03dae499
commit 83e0f4b985
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mobile/ethclient.go
View file

@ -137,8 +137,10 @@ func (ec *EthereumClient) SubscribeNewHead(ctx *Context, handler NewHeadHandler,
case header := <-ch: case header := <-ch:
handler.OnNewHead(&Header{header}) handler.OnNewHead(&Header{header})
case err := <-rawSub.Err(): case err, ok := <-rawSub.Err():
if ok {
handler.OnError(err.Error()) handler.OnError(err.Error())
}
return return
} }
} }
@ -226,8 +228,10 @@ func (ec *EthereumClient) SubscribeFilterLogs(ctx *Context, query *FilterQuery,
case log := <-ch: case log := <-ch:
handler.OnFilterLogs(&Log{&log}) handler.OnFilterLogs(&Log{&log})
case err := <-rawSub.Err(): case err, ok := <-rawSub.Err():
if ok {
handler.OnError(err.Error()) handler.OnError(err.Error())
}
return return
} }
} }

4
mobile/shhclient.go
View file

@ -160,8 +160,10 @@ func (wc *WhisperClient) SubscribeMessages(ctx *Context, criteria *Criteria, han
case message := <-ch: case message := <-ch:
handler.OnNewMessage(&Message{message}) handler.OnNewMessage(&Message{message})
case err := <-rawSub.Err(): case err, ok := <-rawSub.Err():
if ok {
handler.OnError(err.Error()) handler.OnError(err.Error())
}
return return
} }
} }