Return contentwrapper after chaching stream content, instead of setti…

…ng the reader of the old content object
qvest-digital · Jul 11, 2016 · 0f72e3e · 0f72e3e
1 parent f0d05ba
commit 0f72e3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/composition/cache_loader.go b/composition/cache_loader.go
@@ -42,7 +42,7 @@ func (loader *CachingContentLoader) Load(fd *FetchDefinition) (Content, error) {
 						streamBytes: streamBytes,
 					}
 					loader.cache.Set(hash, fd.URL, c.MemorySize(), cw)
-					c.SetReader(cw.Reader())
+					return cw, err
 				}
 			} else {
 				loader.cache.Set(hash, fd.URL, c.MemorySize(), c)

diff --git a/composition/cache_loader_test.go b/composition/cache_loader_test.go
@@ -122,8 +122,10 @@ func Test_CacheLoader_NotFound_With_Stream(t *testing.T) {
 
 		// it is returned
 		result, err := loader.Load(fd)
+		resultbytes, err := ioutil.ReadAll(result.Reader())
+		resultstring := string(resultbytes)
 		a.NoError(err)
-		a.Equal(c, result)
+		a.Equal("foobar", resultstring)
 		ctrl.Finish()
 	}
 }