12447: Require Content-Length in KeepClient.Get

[arvados.git] / sdk / go / keepclient / block_cache.go

diff --git a/sdk/go/keepclient/block_cache.go b/sdk/go/keepclient/block_cache.go
index ca19f41bdc2235b24e30156ec5032205a5f242d6..5d8daad60d4be6dfad3a6f3c2003f759f2967956 100644 (file)
--- a/sdk/go/keepclient/block_cache.go
+++ b/sdk/go/keepclient/block_cache.go
@@ -67,7 +67,7 @@ func (c *BlockCache) Get(kc *KeepClient, locator string) ([]byte, error) {
                        rdr, size, _, err := kc.Get(locator)
                        var data []byte
                        if err == nil {
-                               data := make([]byte, size, BLOCKSIZE)
+                               data = make([]byte, size, BLOCKSIZE)
                                _, err = io.ReadFull(rdr, data)
                                err2 := rdr.Close()
                                if err == nil {
@@ -75,7 +75,7 @@ func (c *BlockCache) Get(kc *KeepClient, locator string) ([]byte, error) {
                                }
                        }
                        c.mtx.Lock()
-                       b.data, b.err = data.Bytes(), err
+                       b.data, b.err = data, err
                        c.mtx.Unlock()
                        close(b.fetched)
                        go c.Sweep()
@@ -94,13 +94,13 @@ func (c *BlockCache) Get(kc *KeepClient, locator string) ([]byte, error) {
 }
 
 func (c *BlockCache) setup() {
+       c.mtx.Lock()
        c.cache = make(map[string]*cacheBlock)
+       c.mtx.Unlock()
 }
 
 func (c *BlockCache) Clear() {
-       c.mtx.Lock()
        c.setup()
-       c.mtx.Unlock()
 }
 
 type timeSlice []time.Time