---

jean-philippe-martin · neozwu · commit 5339e78a1b27 · 2017-06-20T11:05:17.000-07:00
yaml --- r: 8129 b: refs/heads/tswast-patch-1 c: 466a8d4 h: refs/heads/master i: 8127: 4715f43
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 7c20c6f0663147ed667d782c1e37551d80fc74e7
+refs/heads/tswast-patch-1: 466a8d4f70aab42596007f4a3fb07b791f363509
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -97,9 +97,13 @@ private static class LazyPathIterator extends AbstractIterator<Path> {
     private final Iterator<Blob> blobIterator;
     private final Filter<? super Path> filter;
     private final CloudStorageFileSystem fileSystem;
+    private final String prefix;
 
-    LazyPathIterator(CloudStorageFileSystem fileSystem, Iterator<Blob> blobIterator,
+    LazyPathIterator(CloudStorageFileSystem fileSystem,
+                     String prefix,
+                     Iterator<Blob> blobIterator,
                      Filter<? super Path> filter) {
+      this.prefix = prefix;
       this.blobIterator = blobIterator;
       this.filter = filter;
       this.fileSystem = fileSystem;
@@ -110,6 +114,10 @@ protected Path computeNext() {
       while (blobIterator.hasNext()) {
         Path path = fileSystem.getPath(blobIterator.next().getName());
         try {
+          if (path.toString().equals(prefix)) {
+            // do not return ourselves, because that confuses recursive descents.
+            continue;
+          }
           if (filter.accept(path)) {
             return path;
           }
@@ -617,14 +625,14 @@ public DirectoryStream<Path> newDirectoryStream(Path dir, final Filter<? super P
     final CloudStoragePath cloudPath = CloudStorageUtil.checkPath(dir);
     checkNotNull(filter);
     initStorage();
-    String prefix = cloudPath.toRealPath().toString();
+    final String prefix = cloudPath.toRealPath().toString();
     final Iterator<Blob> blobIterator = storage.list(cloudPath.bucket(),
         Storage.BlobListOption.prefix(prefix), Storage.BlobListOption.currentDirectory(),
         Storage.BlobListOption.fields()).iterateAll().iterator();
     return new DirectoryStream<Path>() {
       @Override
       public Iterator<Path> iterator() {
-        return new LazyPathIterator(cloudPath.getFileSystem(), blobIterator, filter);
+        return new LazyPathIterator(cloudPath.getFileSystem(), prefix, blobIterator, filter);
       }
 
       @Override
