projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13959: Default 5-minute timeout for API calls.
[arvados.git]
/
sdk
/
go
/
keepclient
/
hashcheck.go
diff --git
a/sdk/go/keepclient/hashcheck.go
b/sdk/go/keepclient/hashcheck.go
index 726b81362ca6d4e9b1db43f6f8677111039911b3..9295c14cc24a47cd38479e19a8aa57dc91c1c42a 100644
(file)
--- 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 {
_, err = io.Copy(this.Hash, this.Reader)
if closer, ok := this.Reader.(io.Closer); ok {
-
err2
:= closer.Close()
- if err
2 != nil && err
== nil {
- return err2
+
closeErr
:= closer.Close()
+ if err == nil {
+ err = closeErr
}
}
if err != nil {
return err
}
}
}
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
}
}