---

andrey-qlogic · JesseLovelace · commit 14a4dfc4f7d4 · 2019-01-09T14:32:08.000-08:00
yaml --- r: 14001 b: refs/heads/autosynth-container c: 4aa0737 h: refs/heads/master i: 13999: 45828e8
diff --git a/[refs] b/[refs]
@@ -113,7 +113,7 @@ refs/tags/v0.65.0: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 8e86445e504cea6f99b9fb237bfd7f0e5ef8b3ce
-refs/heads/autosynth-container: 1ee33dce9c137938be0650f065717700d78f9bf6
+refs/heads/autosynth-container: 4aa0737f6c32ffe4057a3f6a3b22fb9d3620e0eb
 refs/heads/autosynth-dataproc: bc74a8841bc1693d7945d991d15979df550b1fd1
 refs/heads/autosynth-monitoring: 120f508e0065f4ce39cf0e6a69a08138773f2cfb
 refs/heads/autosynth-pubsub: ed3340e32d13bb1a42ca4431cb1ad9bdaf550aa4
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/branches/autosynth-container/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -768,6 +768,12 @@ public <A extends BasicFileAttributes> A readAttributes(
         }
         CloudStorageObjectAttributes ret;
         ret = new CloudStorageObjectAttributes(blobInfo);
+        // if size is 0 it could be a folder
+        if (ret.size() == 0 && cloudPath.seemsLikeADirectoryAndUsePseudoDirectories(storage)) {
+          @SuppressWarnings("unchecked")
+          A result = (A) new CloudStoragePseudoDirectoryAttributes(cloudPath);
+          return result;
+        }
         @SuppressWarnings("unchecked")
         A result = (A) ret;
         return result;
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/branches/autosynth-container/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
@@ -38,6 +38,7 @@
 public class CloudStorageFileAttributesTest {
 
   private static final byte[] HAPPY = "(✿◕ ‿◕ )ノ".getBytes(UTF_8);
+  private static final byte[] EMPTY = "".getBytes(UTF_8);
 
   private Path path;
   private Path dir;
@@ -104,6 +105,14 @@ public void testIsDirectory() throws IOException {
     assertThat(Files.readAttributes(dir, CloudStorageFileAttributes.class).isDirectory()).isTrue();
   }
 
+  @Test
+  public void testIsPseudoDirectory() throws IOException {
+    Files.write(path, EMPTY);
+    assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).isDirectory())
+        .isFalse();
+    assertThat(Files.readAttributes(dir, CloudStorageFileAttributes.class).isDirectory()).isTrue();
+  }
+
   @Test
   public void testIsRegularFile() throws IOException {
     Files.write(path, HAPPY);
