From 2ed3474ab8e52c98a87e390d5128d45d693a115d Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Mon, 22 Aug 2016 03:29:05 +0200 Subject: ForEach review and Commit.Tree err return --- core/object.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'core/object.go') diff --git a/core/object.go b/core/object.go index d777f4a..9c9a74e 100644 --- a/core/object.go +++ b/core/object.go @@ -141,8 +141,10 @@ func (iter *ObjectLookupIter) Next() (Object, error) { // ForEach call the cb function for each object contained on this iter until // an error happends or the end of the iter is reached. If ErrStop is sent -// the iteration is stop but no error is returned +// the iteration is stop but no error is returned. The iterator is closed. func (iter *ObjectLookupIter) ForEach(cb func(Object) error) error { + defer iter.Close() + for _, hash := range iter.series { obj, err := iter.storage.Get(hash) if err != nil { @@ -197,8 +199,9 @@ func (iter *ObjectSliceIter) Next() (Object, error) { // ForEach call the cb function for each object contained on this iter until // an error happends or the end of the iter is reached. If ErrStop is sent -// the iteration is stop but no error is returned +// the iteration is stop but no error is returned. The iterator is closed. func (iter *ObjectSliceIter) ForEach(cb func(Object) error) error { + defer iter.Close() for _, o := range iter.series { if err := cb(o); err != nil { if err == ErrStop { -- cgit