Repository: jena Updated Branches: refs/heads/master 2746da8ee -> 44fdb1eb6
JENA-813 : Use IteratorConcat for iteraing over all graphs. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e4554796 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e4554796 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e4554796 Branch: refs/heads/master Commit: e4554796a25b919595c17632259a8de02664276d Parents: 4554915 Author: Andy Seaborne <a...@apache.org> Authored: Tue Nov 11 10:19:49 2014 +0000 Committer: Andy Seaborne <a...@apache.org> Committed: Tue Nov 11 10:19:49 2014 +0000 ---------------------------------------------------------------------- .../com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/e4554796/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java index 8de21f3..ac9530d 100644 --- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java +++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java @@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.core; import java.util.Iterator ; import org.apache.jena.atlas.iterator.Iter ; +import org.apache.jena.atlas.iterator.IteratorConcat ; import org.apache.jena.atlas.lib.Lib ; import com.hp.hpl.jena.graph.Graph ; @@ -70,15 +71,15 @@ public abstract class DatasetGraphCollection extends DatasetGraphBaseFind protected Iterator<Quad> findInAnyNamedGraphs(Node s, Node p, Node o) { Iterator<Node> gnames = listGraphNodes() ; - Iterator<Quad> iter = null ; + IteratorConcat<Quad> iter = new IteratorConcat<>() ; + // Named graphs for ( ; gnames.hasNext() ; ) { Node gn = gnames.next(); Iterator<Quad> qIter = findInSpecificNamedGraph(gn, s, p, o) ; if ( qIter != null ) - // copes with null for iter - iter = Iter.append(iter, qIter) ; + iter.add(qIter) ; } return iter ; }