---

andrey-qlogic · JesseLovelace · commit cb6273fbc644 · 2019-01-09T14:32:08.000-08:00
yaml --- r: 17111 b: refs/heads/autosynth-scheduler c: 4aa0737 h: refs/heads/master i: 17109: e918444 17107: 07a15e1 17103: 1e78a06
diff --git a/[refs] b/[refs]
@@ -138,7 +138,7 @@ refs/heads/autosynth-kms: 4fff8f3cf6c830f7706ac4ef272f036bb87fbaf8
 refs/heads/autosynth-language: 6262e2eb76944f01972c887b3e684aaf65ec999a
 refs/heads/autosynth-os-login: a88a337797996a205873040a63abe1d3116f5789
 refs/heads/autosynth-redis: 0cdb2e47359d51b73763bcea8af3de62aa99119b
-refs/heads/autosynth-scheduler: 1ee33dce9c137938be0650f065717700d78f9bf6
+refs/heads/autosynth-scheduler: 4aa0737f6c32ffe4057a3f6a3b22fb9d3620e0eb
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
 refs/heads/autosynth-spanner: 563dc6c78c6a2579b681f441f0a9b59005212394
 refs/heads/autosynth-speech: 878243784f42771467d7cf52bd59e4a6a7950ee9
diff --git a/branches/autosynth-scheduler/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/branches/autosynth-scheduler/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-scheduler/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/branches/autosynth-scheduler/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);
