From fd122a5de68e3c40d904e719a5f6e18cb3127906 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sun, 24 Nov 2013 18:40:51 -0800
Subject: [PATCH] Blind fix of bug in 3fa6d69405f036308931dd36e5070b2b19dbeadf.

See, tests matter.

Change-Id: I8c42be90db246e3529eac9f62711ea5510db605d
---
 pkg/client/get.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/client/get.go b/pkg/client/get.go
index ed8780f98..971f21592 100644
--- a/pkg/client/get.go
+++ b/pkg/client/get.go
@@ -119,9 +119,14 @@ func (c *Client) FetchVia(b blob.Ref, v []blob.Ref) (body io.ReadCloser, size in
 		}
 	}
 
+	var rc io.ReadCloser = struct {
+		io.Reader
+		io.Closer
+	}{reader, closer}
+
 	if c.via == nil {
 		// Not in sharing mode, so return immediately.
-		return resp.Body, size, nil
+		return rc, size, nil
 	}
 
 	// Slurp 1 MB to find references to other blobrefs for the via path.
@@ -138,10 +143,7 @@ func (c *Client) FetchVia(b blob.Ref, v []blob.Ref) (body io.ReadCloser, size in
 			c.via[blobstr] = b.String()
 		}
 	}
-	return struct {
-		io.Reader
-		io.Closer
-	}{reader, closer}, size, nil
+	return rc, size, nil
 }
 
 func (c *Client) ReceiveBlob(br blob.Ref, source io.Reader) (blob.SizedRef, error) {