9009: Fix missing Close() in collectionreader.
authorTom Clegg <tom@curoverse.com>
Tue, 19 Apr 2016 15:43:09 +0000 (11:43 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 19 Apr 2016 15:43:09 +0000 (11:43 -0400)
sdk/go/keepclient/collectionreader.go
sdk/go/keepclient/collectionreader_test.go

index d2c171d96111af3e3c6922f73511427d0d41ae2a..bed60f499562a36c4585018932860fe35df34701 100644 (file)
@@ -209,6 +209,10 @@ GET:
                }
                var buf = make([]byte, fs.Offset+fs.Len)
                _, err = io.ReadFull(rdr, buf)
+               errClosing := rdr.Close()
+               if err == nil {
+                       err = errClosing
+               }
                if err != nil {
                        r.err = err
                        close(r.errNotNil)
index 58a047c55a053c14d8324266363fc7ad7fae33fa..2cc23738855dfeab3cd8ab2ef33cb27055a35fa1 100644 (file)
@@ -220,4 +220,5 @@ func (s *CollectionReaderUnit) TestCollectionReaderDataError(c *check.C) {
                c.Check(err, check.NotNil)
                c.Check(err, check.Not(check.Equals), io.EOF)
        }
+       c.Check(rdr.Close(), check.NotNil)
 }