X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6f6ce90eb894bde190fd7522cbec037fe61fc25c..21e13deb6b38f6bea48923306755f648acd2d794:/sdk/go/keepclient/hashcheck.go?ds=sidebyside diff --git a/sdk/go/keepclient/hashcheck.go b/sdk/go/keepclient/hashcheck.go index 726b81362c..9295c14cc2 100644 --- a/sdk/go/keepclient/hashcheck.go +++ b/sdk/go/keepclient/hashcheck.go @@ -72,19 +72,16 @@ func (this HashCheckingReader) Close() (err error) { _, err = io.Copy(this.Hash, this.Reader) if closer, ok := this.Reader.(io.Closer); ok { - err2 := closer.Close() - if err2 != nil && err == nil { - return err2 + closeErr := closer.Close() + if err == nil { + err = closeErr } } if err != nil { return err } - - sum := this.Hash.Sum(nil) - if fmt.Sprintf("%x", sum) != this.Check { - err = BadChecksum + if fmt.Sprintf("%x", this.Hash.Sum(nil)) != this.Check { + return BadChecksum } - - return err + return nil }