---

andrey-qlogic · JesseLovelace · commit 764ff90e91a1 · 2019-01-09T14:32:08.000-08:00
yaml --- r: 17763 b: refs/heads/autosynth-trace c: 4aa0737 h: refs/heads/master i: 17761: e060a1c 17759: e97de29
diff --git a/[refs] b/[refs]
@@ -144,7 +144,7 @@ refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
 refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
 refs/heads/autosynth-tasks: b0cdb991f3f75345151a3f68db1aab273dfc069b
 refs/heads/autosynth-texttospeech: 2dcc5dc22be0f456caa1b6a8a4bcdace2641239c
-refs/heads/autosynth-trace: 1ee33dce9c137938be0650f065717700d78f9bf6
+refs/heads/autosynth-trace: 4aa0737f6c32ffe4057a3f6a3b22fb9d3620e0eb
 refs/heads/autosynth-websecurityscanner: d4febbffb6c648b74faec62fe90e20adadc9a7d3
 refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
 refs/heads/elharo-patch-1: ce159ef828d3c545991ff78e7b6e0d912a9453e9
diff --git a/branches/autosynth-trace/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/branches/autosynth-trace/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-trace/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/branches/autosynth-trace/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);
