FIX: connection leak in query-iterator (#1164)

src/main/java/io/ebeaninternal/server/query/CQuery.java

@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 /**
  * An object that represents a SqlSelect statement.
@@ -421,6 +422,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
 
     if (!moveToNextRow()) {
       if (currentBean == null) {
+        nextBean = null;
         return false;
       } else {
         // the last bean
@@ -508,6 +510,9 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
       auditIterateNextBean();
     }
     hasNextCache = false;
+    if (nextBean == null) {
+      throw new NoSuchElementException();
+    }
     return nextBean;
   }
 

src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java

@@ -14,6 +14,8 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
   private final CQuery<T> cquery;
 
   private final OrmQueryRequest<T> request;
+  
+  private boolean closed;
 
   CQueryIteratorSimple(CQuery<T> cquery, OrmQueryRequest<T> request) {
     this.cquery = cquery;
@@ -22,11 +24,17 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
 
   @Override
   public boolean hasNext() {
+    boolean ret = false;
     try {
       request.flushPersistenceContextOnIterate();
-      return cquery.hasNext();
+      ret = cquery.hasNext();
+      return ret;
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
+    } finally {
+      if (!ret) {
+        close();
+      }
     }
   }
 
@@ -38,9 +46,12 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
 
   @Override
   public void close() {
-    cquery.updateExecutionStatisticsIterator();
-    cquery.close();
-    request.endTransIfRequired();
+    if (!closed) {
+      closed = true;
+      cquery.updateExecutionStatisticsIterator();
+      cquery.close();
+      request.endTransIfRequired();
+    }
   }
 
   @Override