tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2563 from obscuren/rpcaddr-fix

Browse Source 
eth: fixed double close of channel. Fixes #2555
This commit is contained in:
Jeffrey Wilcke 2016-05-12 20:50:40 +02:00
commit 72e60dea36
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
event/event.go
View File

@ -66,6 +66,9 @@ func (mux *TypeMux) Subscribe(types ...interface{}) Subscription {
mux.mutex.Lock() mux.mutex.Lock()
defer mux.mutex.Unlock() defer mux.mutex.Unlock()
if mux.stopped { if mux.stopped {
// set the status to closed so that calling Unsubscribe after this
// call will short curuit
sub.closed = true
close(sub.postC) close(sub.postC)
} else { } else {
if mux.subm == nil { if mux.subm == nil {

8
event/event_test.go
View File

@ -25,6 +25,14 @@ import (
type testEvent int type testEvent int
func TestSubCloseUnsub(t *testing.T) {
// the point of this test is **not** to panic
var mux TypeMux
mux.Stop()
sub := mux.Subscribe(int(0))
sub.Unsubscribe()
}
func TestSub(t *testing.T) { func TestSub(t *testing.T) {
mux := new(TypeMux) mux := new(TypeMux)
defer mux.Stop() defer mux.Stop()