Merge pull request #70 from zanata/rhbz980271

Add workaround for empty ResultSet
zanata · Jul 23, 2013 · 17b49d2 · 17b49d2
2 parents 902e80b + 3fc3e21
commit 17b49d2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java b/zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
@@ -25,9 +25,11 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.hibernate.HibernateException;
+import lombok.extern.slf4j.Slf4j;
+
 import org.hibernate.ScrollableResults;
 
+@Slf4j
 class ScrollableResultsIterator implements Iterator<Object[]>, Closeable
 {
    private boolean closed;
@@ -82,8 +84,11 @@ public boolean hasNext()
       catch (RuntimeException e)
       {
          // UGLY hack to work around https://hibernate.atlassian.net/browse/HHH-2811
-         if (e.getMessage() != null && e.getMessage().contains("could not perform sequential read of results (forward)"))
+         if (e.getMessage() != null &&
+               (e.getMessage().contains("could not perform sequential read of results (forward)") ||
+                e.getMessage().contains("could not doAfterTransactionCompletion sequential read of results (forward)")))
          {
+            log.debug("assuming empty ResultSet", e);
             close();
             return false;
          }