projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename home repository into ego repository.
[lgpl/argeo-commons.git]
/
org.argeo.jcr
/
src
/
org
/
argeo
/
jcr
/
fs
/
NodeDirectoryStream.java
diff --git
a/org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
b/org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
index 84dd22d6ae8f4951824f3a808a85aa27e33517dd..eda07a548eff2355876c4f3943db53cf3492b02b 100644
(file)
--- a/
org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
+++ b/
org.argeo.jcr/src/org/argeo/jcr/fs/NodeDirectoryStream.java
@@
-11,11
+11,14
@@
import javax.jcr.NodeIterator;
public class NodeDirectoryStream implements DirectoryStream<Path> {
private final JcrFileSystem fs;
private final NodeIterator nodeIterator;
public class NodeDirectoryStream implements DirectoryStream<Path> {
private final JcrFileSystem fs;
private final NodeIterator nodeIterator;
+ private final Iterator<JcrPath> additionalPaths;
private final Filter<? super Path> filter;
private final Filter<? super Path> filter;
- public NodeDirectoryStream(JcrFileSystem fs, NodeIterator nodeIterator, Filter<? super Path> filter) {
+ public NodeDirectoryStream(JcrFileSystem fs, NodeIterator nodeIterator, Iterator<JcrPath> additionalPaths,
+ Filter<? super Path> filter) {
this.fs = fs;
this.nodeIterator = nodeIterator;
this.fs = fs;
this.nodeIterator = nodeIterator;
+ this.additionalPaths = additionalPaths;
this.filter = filter;
}
this.filter = filter;
}
@@
-50,6
+53,12
@@
public class NodeDirectoryStream implements DirectoryStream<Path> {
throw new JcrFsException("Could not get next path", e);
}
}
throw new JcrFsException("Could not get next path", e);
}
}
+
+ if (next == null) {
+ if (additionalPaths.hasNext())
+ next = additionalPaths.next();
+ }
+
return next != null;
}
return next != null;
}