From f296300509a845730f74d5870bfa9a4cc0ae43ba Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 8 Dec 2015 20:29:07 +0100
Subject: [PATCH] p2p/rlpx: prefer returning new queued packets over errors

This fixes intermittent failures in the p2p tests.
---
 p2p/rlpx/rlpx.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go
index 49d78aeffa..704a23324f 100644
--- a/p2p/rlpx/rlpx.go
+++ b/p2p/rlpx/rlpx.go
@@ -332,7 +332,7 @@ func (p *Protocol) ReadPacket() (totalSize uint32, r io.Reader, err error) {
 	for len(p.newPackets) == 0 && p.readErr == nil {
 		p.readCond.Wait()
 	}
-	if p.readErr != nil {
+	if len(p.newPackets) == 0 && p.readErr != nil {
 		return 0, nil, p.readErr
 	}
 	pr := p.newPackets[0]