Merge pull request #73 from WKBae/close_objectv5.1.0

Close Reader & Writer of EncodedObject after use

2 files changed, 14 insertions, 2 deletions

diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go
index 862cc1b..7437174 100644
--- a/storage/filesystem/object.go
+++ b/storage/filesystem/object.go
@@ -408,6 +408,8 @@ func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedOb
 		return nil, err
 	}
 
+	defer ioutil.CheckClose(w, &err)
+
 	s.objectCache.Put(obj)
 
 	_, err = io.Copy(w, r)
diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go
index d87a7dd..2c00e75 100644
--- a/storage/test/storage_suite.go
+++ b/storage/test/storage_suite.go
@@ -494,12 +494,12 @@ func objectEquals(a plumbing.EncodedObject, b plumbing.EncodedObject) error {
 
 	ra, err := a.Reader()
 	if err != nil {
-		return fmt.Errorf("can't get reader on b: %q", err)
+		return fmt.Errorf("can't get reader on a: %q", err)
 	}
 
 	rb, err := b.Reader()
 	if err != nil {
-		return fmt.Errorf("can't get reader on a: %q", err)
+		return fmt.Errorf("can't get reader on b: %q", err)
 	}
 
 	ca, err := ioutil.ReadAll(ra)
@@ -516,5 +516,15 @@ func objectEquals(a plumbing.EncodedObject, b plumbing.EncodedObject) error {
 		return errors.New("content does not match")
 	}
 
+	err = rb.Close()
+	if err != nil {
+		return fmt.Errorf("can't close reader on b: %q", err)
+	}
+
+	err = ra.Close()
+	if err != nil {
+		return fmt.Errorf("can't close reader on a: %q", err)
+	}
+
 	return nil
 }