X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e3a1bf022cbc081cf7c7ebb441dc1ab1df200f98..8fc563f15301baa0a59bfae748e0c8cd2d5eefda:/sdk/go/keepclient/collectionreader.go

diff --git a/sdk/go/keepclient/collectionreader.go b/sdk/go/keepclient/collectionreader.go
index 68ecc6e430..33bb58710e 100644
--- a/sdk/go/keepclient/collectionreader.go
+++ b/sdk/go/keepclient/collectionreader.go
@@ -40,6 +40,10 @@ func (kc *KeepClient) CollectionFileReader(collection map[string]interface{}, fi
 		return nil, ErrNoManifest
 	}
 	m := manifest.Manifest{Text: mText}
+	return kc.ManifestFileReader(m, filename)
+}
+
+func (kc *KeepClient) ManifestFileReader(m manifest.Manifest, filename string) (ReadCloserWithLen, error) {
 	rdrChan := make(chan *cfReader)
 	go kc.queueSegmentsToGet(m, filename, rdrChan)
 	r, ok := <-rdrChan
@@ -205,12 +209,16 @@ 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)
 			return
 		}
-		for bOff, bLen := fs.Offset, dataSliceSize; bOff <= fs.Offset+fs.Len && bLen > 0; bOff += bLen {
+		for bOff, bLen := fs.Offset, dataSliceSize; bOff < fs.Offset+fs.Len && bLen > 0; bOff += bLen {
 			if bOff+bLen > fs.Offset+fs.Len {
 				bLen = fs.Offset + fs.Len - bOff
 			}
@@ -235,7 +243,7 @@ GET:
 	// In case we exited the above loop early: before returning,
 	// drain the toGet channel so its sender doesn't sit around
 	// blocking forever.
-	for _ = range r.toGet {
+	for range r.toGet {
 	}
 }