Use nullIterator, not nullIter. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5a2f73a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5a2f73a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5a2f73a
Branch: refs/heads/jena3 Commit: b5a2f73a715fdc1c8d0d2a8f428c818b2fb81679 Parents: e0b861a Author: Andy Seaborne <[email protected]> Authored: Sun Apr 26 00:10:59 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Sun Apr 26 00:10:59 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java | 2 +- .../src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b5a2f73a/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java index 311b242..61a4405 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java @@ -114,7 +114,7 @@ public class DistinctDataNet<E> extends DistinctDataBag<E> // If we havn't spilled, then we have already indicated all distinct values via .netAdd() if (!spilled) { - return Iter.nullIter(); + return Iter.nullIterator(); } Iterator<E> blacklist; http://git-wip-us.apache.org/repos/asf/jena/blob/b5a2f73a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java index 82d1c88..c6cfd61 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java @@ -41,7 +41,7 @@ public class IteratorCons<T> implements Iterator<T>, Iterable<T> public static <X> Iterator<X> create(Iterator<? extends X> iter1, Iterator<? extends X> iter2) { if ( iter1 == null && iter2 == null ) - return Iter.nullIter() ; + return Iter.nullIterator() ; // The casts are safe because an iterator can only return X, and does not take an X an an assignment. if ( iter1 == null )
