From 3ce9adbc0b5af8073ce143f522849cece4852547 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Tue, 14 Apr 2015 18:55:48 -0700
Subject: [PATCH] Fix Err fallout for graph/bolt iterators

---
 graph/bolt/all_iterator.go | 6 ++++++
 graph/bolt/iterator.go     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/graph/bolt/all_iterator.go b/graph/bolt/all_iterator.go
index 2c8d379..4ae6fca 100644
--- a/graph/bolt/all_iterator.go
+++ b/graph/bolt/all_iterator.go
@@ -33,6 +33,7 @@ type AllIterator struct {
 	dir    quad.Direction
 	qs     *QuadStore
 	result *Token
+	err    error
 	buffer [][]byte
 	offset int
 	done   bool
@@ -121,6 +122,7 @@ func (it *AllIterator) Next() bool {
 		})
 		if err != nil {
 			glog.Error("Error nexting in database: ", err)
+			it.err = err
 			it.done = true
 			return false
 		}
@@ -134,6 +136,10 @@ func (it *AllIterator) Next() bool {
 	return true
 }
 
+func (it *AllIterator) Err() error {
+	return it.err
+}
+
 func (it *AllIterator) ResultTree() *graph.ResultTree {
 	return graph.NewResultTree(it.Result())
 }
diff --git a/graph/bolt/iterator.go b/graph/bolt/iterator.go
index b7df4e9..50b2588 100644
--- a/graph/bolt/iterator.go
+++ b/graph/bolt/iterator.go
@@ -46,6 +46,7 @@ type Iterator struct {
 	dir     quad.Direction
 	qs      *QuadStore
 	result  *Token
+	err     error
 	buffer  [][]byte
 	offset  int
 	done    bool
@@ -170,6 +171,7 @@ func (it *Iterator) Next() bool {
 		if err != nil {
 			if err != errNotExist {
 				glog.Errorf("Error nexting in database: %v", err)
+				it.err = err
 			}
 			it.done = true
 			return false
@@ -184,6 +186,10 @@ func (it *Iterator) Next() bool {
 	return true
 }
 
+func (it *Iterator) Err() error {
+	return it.err
+}
+
 func (it *Iterator) ResultTree() *graph.ResultTree {
 	return graph.NewResultTree(it.Result())
 }