From 47548df8dbdedcb919f12bc0981389de5e4ca58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladimi=CC=81r=20Orany=CC=81?= <vladimir@orany.cz>
Date: Sun, 11 May 2014 19:48:37 +0200
Subject: [PATCH] preparing gaelyk 2.1.2

---
 .../gaelyk/datastore/SelfRestartingQueryResultIterator.groovy | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/groovyx/gaelyk/datastore/SelfRestartingQueryResultIterator.groovy b/core/src/main/groovyx/gaelyk/datastore/SelfRestartingQueryResultIterator.groovy
index 7dddad5f..292d20b5 100644
--- a/core/src/main/groovyx/gaelyk/datastore/SelfRestartingQueryResultIterator.groovy
+++ b/core/src/main/groovyx/gaelyk/datastore/SelfRestartingQueryResultIterator.groovy
@@ -45,6 +45,7 @@ class SelfRestartingQueryResultIterator<T> implements QueryResultIteratorWithQue
             currentCursor = currentIterator.cursor
             return next
         } catch(e){
+            if (!currentCursor) throw new NoSuchElementException()
             if(e.message?.contains('Please restart it with the last cursor')){
                 queryBuilder.startAt(currentCursor)
                 currentIterator = queryBuilder.iterate() as QueryResultIteratorWithQuery
@@ -57,6 +58,7 @@ class SelfRestartingQueryResultIterator<T> implements QueryResultIteratorWithQue
         try {
             return currentIterator.hasNext()
         } catch(e){
+            if (!currentCursor) return false
             if(e.message?.contains('Please restart it with the last cursor')){
                 queryBuilder.startAt(currentCursor)
                 currentIterator = queryBuilder.iterate() as QueryResultIteratorWithQuery
@@ -73,6 +75,7 @@ class SelfRestartingQueryResultIterator<T> implements QueryResultIteratorWithQue
         try {
             return currentIterator.getCursor()
         } catch(e){
+            if (!currentCursor) return null
             if(e.message?.contains('Please restart it with the last cursor')){
                 queryBuilder.startAt(currentCursor)
                 currentIterator = queryBuilder.iterate() as QueryResultIteratorWithQuery
@@ -85,6 +88,7 @@ class SelfRestartingQueryResultIterator<T> implements QueryResultIteratorWithQue
         try {
             return currentIterator.getIndexList()
         } catch(e){
+            if (!currentCursor) return []
             if(e.message?.contains('Please restart it with the last cursor')){
                 queryBuilder.startAt(currentCursor)
                 currentIterator = queryBuilder.iterate() as QueryResultIteratorWithQuery