diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-11-27 06:00:05 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-11-27 06:00:05 +0800 |
| commit | b9db5b37f2d6d8a78769ef62b2ffb81674476fba (patch) | |
| tree | b9fabeb0ece41ca71143d946c1ea40a96df87bd5 /xeth/xeth.go | |
| parent | 168d0e9e45939b7282204f3f52fe86fc8110cfc7 (diff) | |
| parent | b1e014344494d2713f6091299a5b86dc53e1fb4e (diff) | |
| download | dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar.gz dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar.bz2 dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar.lz dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar.xz dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.tar.zst dexon-b9db5b37f2d6d8a78769ef62b2ffb81674476fba.zip | |
Merge pull request #2001 from obscuren/fixes
cmd, crypto: updated web3
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 19c42a9a3..a45ce688b 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -644,7 +644,9 @@ func (p *XEth) NewWhisperFilter(to, from string, topics [][]string) int { callback := func(msg WhisperMessage) { p.messagesMu.RLock() // Only read lock to the filter pool defer p.messagesMu.RUnlock() - p.messages[id].insert(msg) + if p.messages[id] != nil { + p.messages[id].insert(msg) + } } // Initialize the core whisper filter and wrap into xeth id = p.Whisper().Watch(to, from, topics, callback) |