From: Tom Clegg <tom@curoverse.com>
Date: Fri, 19 May 2017 19:55:40 +0000 (-0400)
Subject: 9005: Fix missing error checks.
X-Git-Tag: 1.1.0~235^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cad24bba2240b47f59bc5719a035e85ff5eb60ef

9005: Fix missing error checks.
---

diff --git a/sdk/go/keepclient/hashcheck.go b/sdk/go/keepclient/hashcheck.go
index 1706134757..b97df78d96 100644
--- a/sdk/go/keepclient/hashcheck.go
+++ b/sdk/go/keepclient/hashcheck.go
@@ -63,8 +63,14 @@ func (this HashCheckingReader) WriteTo(dest io.Writer) (written int64, err error
 func (this HashCheckingReader) Close() (err error) {
 	_, err = io.Copy(this.Hash, this.Reader)
 
-	if closer, ok := this.Reader.(io.ReadCloser); ok {
-		err = closer.Close()
+	if closer, ok := this.Reader.(io.Closer); ok {
+		err2 := closer.Close()
+		if err2 != nil && err == nil {
+			return err2
+		}
+	}
+	if err != nil {
+		return err
 	}
 
 	sum := this.Hash.Sum(make([]byte, 0, this.Hash.Size()))