Improve handling of closed iterators.

linkedfactory · Jul 17, 2024 · c2adef2 · c2adef2
1 parent 04d57ac
commit c2adef2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...ory.core/src/main/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitioned.java b/...ory.core/src/main/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitioned.java
@@ -298,9 +298,7 @@ public void close() {
 							}
 						}
 					} finally {
-						if (readLock != null) {
-							readLock.release();
-						}
+						readLock.release();
 						closed = true;
 					}
 				}

diff --git a/...actory.core/src/main/java/io/github/linkedfactory/core/rdf4j/kvin/KvinEvaluationUtil.java b/...actory.core/src/main/java/io/github/linkedfactory/core/rdf4j/kvin/KvinEvaluationUtil.java
@@ -152,6 +152,11 @@ public boolean hasNext() throws QueryEvaluationException {
                         return false;
                     }
                     next = computeNext();
+                    if (isClosed()) {
+                        // close underlying iterator if iteration was closed asynchronously (due to query timeout)
+                        handleClose();
+                        next = null;
+                    }
                 }
                 return next != null;
             }