diff options
Diffstat (limited to 'libgo/go/io/multi.go')
-rw-r--r-- | libgo/go/io/multi.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libgo/go/io/multi.go b/libgo/go/io/multi.go index ed05cac9e72..3a9d03652b0 100644 --- a/libgo/go/io/multi.go +++ b/libgo/go/io/multi.go @@ -18,15 +18,16 @@ func (mr *multiReader) Read(p []byte) (n int, err error) { } } n, err = mr.readers[0].Read(p) + if err == EOF { + mr.readers = mr.readers[1:] + } if n > 0 || err != EOF { - if err == EOF { - // Don't return EOF yet. There may be more bytes - // in the remaining readers. + if err == EOF && len(mr.readers) > 0 { + // Don't return EOF yet. More readers remain. err = nil } return } - mr.readers = mr.readers[1:] } return 0, EOF } |