---

jean-philippe-martin · mziccard · commit 7598d5344e40 · 2016-06-30T09:13:05.000+02:00
yaml --- r: 7409 b: refs/heads/tswast-patch-1 c: 312565c h: refs/heads/master i: 7407: aa20248
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: 29ea8b0df2b5efd4159cdae38b581497efe1be7d
+refs/heads/tswast-patch-1: 312565c38c47fbf5f1b5e26a46be2546056773fd
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java b/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
@@ -158,10 +158,12 @@ public CloudStoragePath getPath(String first, String... more) {
    * Does nothing.
    */
   @Override
-  public void close() {}
+  public void close() throws IOException {
+    // TODO(#809): Synchronously close all channels associated with this FileSystem instance.
+  }
 
   /**
-   * Returns {@code true}.
+   * Returns {@code true}, even if you previously called the {@link #close()} method.
    */
   @Override
   public boolean isOpen() {
diff --git a/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -391,7 +391,7 @@ public void testExists_trailingSlash() {
   }
 
   @Test
-  public void testExists_trailingSlash_disablePseudoDirectories() {
+  public void testExists_trailingSlash_disablePseudoDirectories() throws IOException  {
     try (CloudStorageFileSystem fs = forBucket("military", usePseudoDirectories(false))) {
       assertThat(Files.exists(fs.getPath("fashion/"))).isFalse();
     }
@@ -547,7 +547,7 @@ public void testIsDirectory_trailingSlash_alwaysTrue() {
   }
 
   @Test
-  public void testIsDirectory_trailingSlash_pseudoDirectoriesDisabled_false() {
+  public void testIsDirectory_trailingSlash_pseudoDirectoriesDisabled_false() throws IOException  {
     try (CloudStorageFileSystem fs = forBucket("doodle", usePseudoDirectories(false))) {
       assertThat(Files.isDirectory(fs.getPath("fundir/"))).isFalse();
     }
diff --git a/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java b/branches/tswast-patch-1/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ public void testExists_trailingSlash() {`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`@Test`
`394`		`- public void testExists_trailingSlash_disablePseudoDirectories() {`
	`394`	`+ public void testExists_trailingSlash_disablePseudoDirectories() throws IOException {`
`395`	`395`	`try (CloudStorageFileSystem fs = forBucket("military", usePseudoDirectories(false))) {`
`396`	`396`	`assertThat(Files.exists(fs.getPath("fashion/"))).isFalse();`
`397`	`397`	`}`
`@@ -547,7 +547,7 @@ public void testIsDirectory_trailingSlash_alwaysTrue() {`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`@Test`
`550`		`- public void testIsDirectory_trailingSlash_pseudoDirectoriesDisabled_false() {`
	`550`	`+ public void testIsDirectory_trailingSlash_pseudoDirectoriesDisabled_false() throws IOException {`
`551`	`551`	`try (CloudStorageFileSystem fs = forBucket("doodle", usePseudoDirectories(false))) {`
`552`	`552`	`assertThat(Files.isDirectory(fs.getPath("fundir/"))).isFalse();`
`553`	`553`	`}`