Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren 2015-02-17 16:55:20 +01:00
commit 11e12680eb

View File

@ -253,7 +253,8 @@ func (t *udp) loop() {
case reply := <-t.replies: case reply := <-t.replies:
// run matching callbacks, remove if they return false. // run matching callbacks, remove if they return false.
for i, p := range pending { for i := 0; i < len(pending); i++ {
p := pending[i]
if reply.from == p.from && reply.ptype == p.ptype && p.callback(reply.data) { if reply.from == p.from && reply.ptype == p.ptype && p.callback(reply.data) {
p.errc <- nil p.errc <- nil
copy(pending[i:], pending[i+1:]) copy(pending[i:], pending[i+1:])