[ARVADOS] created: aaab24cd029c049963acf74ff8ec3694c599ba20

[Git user]

        at  aaab24cd029c049963acf74ff8ec3694c599ba20 (commit)


commit aaab24cd029c049963acf74ff8ec3694c599ba20
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Apr 19 11:43:09 2016 -0400

    9009: Fix missing Close() in collectionreader.

diff --git a/sdk/go/keepclient/collectionreader.go b/sdk/go/keepclient/collectionreader.go
index d2c171d..bed60f4 100644
--- a/sdk/go/keepclient/collectionreader.go
+++ b/sdk/go/keepclient/collectionreader.go
@@ -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)
diff --git a/sdk/go/keepclient/collectionreader_test.go b/sdk/go/keepclient/collectionreader_test.go
index 58a047c..2cc2373 100644
--- a/sdk/go/keepclient/collectionreader_test.go
+++ b/sdk/go/keepclient/collectionreader_test.go
@@ -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)
 }

-----------------------------------------------------------------------


hooks/post-receive
--