jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [08/10] jena git commit: JENA-1229: Cancellation is on another thread. Leave to close().
Date Mon, 05 Sep 2016 12:29:44 GMT
JENA-1229: Cancellation is on another thread. Leave to close().

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1c39de90
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1c39de90
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1c39de90

Branch: refs/heads/master
Commit: 1c39de9032743094b10bc8ce52990a93971c5ea8
Parents: 68bf345
Author: Andy Seaborne <andy@apache.org>
Authored: Mon Sep 5 13:21:18 2016 +0100
Committer: Andy Seaborne <andy@apache.org>
Committed: Mon Sep 5 13:21:18 2016 +0100

----------------------------------------------------------------------
 .../jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java      | 2 +-
 .../jena/sparql/engine/iterator/QueryIterDistinctReduced.java  | 3 +--
 .../apache/jena/sparql/engine/join/AbstractIterHashJoin.java   | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
index 755b1bb..50a2b6a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
@@ -46,7 +46,7 @@ public abstract class QueryIter2LoopOnLeft extends QueryIter2
     
     @Override
     protected void requestSubCancel()
-    { tableRight.close() ; }
+    { }
    
     @Override
     protected final boolean hasNextBinding()

http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
index 0824b5b..7921f02 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctReduced.java
@@ -37,10 +37,9 @@ public abstract class QueryIterDistinctReduced extends QueryIter1
     protected void closeSubIterator()
     { slot = null ; }
 
-    // Subclasses may want to implement this as well. 
     @Override
     protected void requestSubCancel()
-    { closeSubIterator() ; }
+    { }
     
     @Override
     final

http://git-wip-us.apache.org/repos/asf/jena/blob/1c39de90/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
index 11701e1..730d772 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/AbstractIterHashJoin.java
@@ -233,10 +233,8 @@ public abstract class AbstractIterHashJoin extends QueryIter2 {
     }
 
     @Override
-    protected void requestSubCancel() {
-        iterStream.close() ;
-        hashTable.clear(); 
-    }
+    protected void requestSubCancel() 
+    { }
 }
 
 


Mime
View raw message