diff options
author | Tobias Burnus <burnus@net-b.de> | 2016-09-20 21:49:12 +0000 |
---|---|---|
committer | Tobias Burnus <burnus@net-b.de> | 2016-09-20 21:49:12 +0000 |
commit | abf704d05073530028336551d8565aca6403e985 (patch) | |
tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /libgo/go/io/multi.go | |
parent | c720aaa3bf123cbfabe14016711f3683d840b6a5 (diff) | |
parent | 168ff71ac9c1c9ad651456fc6350b3ab43e6aa2a (diff) |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
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 } |