diff --git a/graph/iterator/and_iterator.go b/graph/iterator/and_iterator.go index c6aedc5..418a469 100644 --- a/graph/iterator/and_iterator.go +++ b/graph/iterator/and_iterator.go @@ -293,9 +293,9 @@ func (it *And) Close() error { err := it.primaryIt.Close() for _, sub := range it.internalIterators { - serr := sub.Close() - if serr != nil && err == nil { - err = serr + _err := sub.Close() + if _err != nil && err == nil { + err = _err } } diff --git a/graph/iterator/hasa_iterator.go b/graph/iterator/hasa_iterator.go index 0a6b051..a799bdd 100644 --- a/graph/iterator/hasa_iterator.go +++ b/graph/iterator/hasa_iterator.go @@ -263,9 +263,9 @@ func (it *HasA) Close() error { err := it.primaryIt.Close() if it.resultIt != nil { - err2 := it.resultIt.Close() + _err := it.resultIt.Close() if err == nil { - err = err2 + err = _err } } diff --git a/graph/iterator/linksto_iterator.go b/graph/iterator/linksto_iterator.go index cd65c5c..2a4cd7d 100644 --- a/graph/iterator/linksto_iterator.go +++ b/graph/iterator/linksto_iterator.go @@ -200,9 +200,9 @@ func (it *LinksTo) Result() graph.Value { func (it *LinksTo) Close() error { err := it.nextIt.Close() - err2 := it.primaryIt.Close() - if err2 != nil && err == nil { - err = err2 + _err := it.primaryIt.Close() + if _err != nil && err == nil { + err = _err } return err diff --git a/graph/iterator/not_iterator.go b/graph/iterator/not_iterator.go index fc1e1e3..98232d6 100644 --- a/graph/iterator/not_iterator.go +++ b/graph/iterator/not_iterator.go @@ -132,9 +132,9 @@ func (it *Not) NextPath() bool { func (it *Not) Close() error { err := it.primaryIt.Close() - err2 := it.allIt.Close() - if err2 != nil && err == nil { - err = err2 + _err := it.allIt.Close() + if _err != nil && err == nil { + err = _err } return err diff --git a/graph/iterator/or_iterator.go b/graph/iterator/or_iterator.go index 9cb1660..25524e6 100644 --- a/graph/iterator/or_iterator.go +++ b/graph/iterator/or_iterator.go @@ -261,9 +261,9 @@ func (it *Or) Close() error { var err error for _, sub := range it.internalIterators { - serr := sub.Close() - if serr != nil && err == nil { - err = serr + _err := sub.Close() + if _err != nil && err == nil { + err = _err } }