forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/rlpx: prefer returning new queued packets over errors

Browse source 
This fixes intermittent failures in the p2p tests.
This commit is contained in:
Felix Lange 2015-12-08 20:29:07 +01:00
parent e66ead8d86
commit f296300509
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/rlpx/rlpx.go
View file

@ -332,7 +332,7 @@ func (p *Protocol) ReadPacket() (totalSize uint32, r io.Reader, err error) {
for len(p.newPackets) == 0 && p.readErr == nil { for len(p.newPackets) == 0 && p.readErr == nil {
p.readCond.Wait() p.readCond.Wait()
} }
if p.readErr != nil { if len(p.newPackets) == 0 && p.readErr != nil {
return 0, nil, p.readErr return 0, nil, p.readErr
} }
pr := p.newPackets[0] pr := p.newPackets[0]