---

jean-philippe-martin · mziccard · commit b9f093f466ec · 2016-06-20T08:31:34.000+02:00
yaml --- r: 4419 b: refs/heads/gcs-nio c: f322382 h: refs/heads/master i: 4417: 798abe7 4415: c42a483
diff --git a/[refs] b/[refs]
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: e7ca84162ae4b21e78b8297f713ecad6c90f2d38
+refs/heads/gcs-nio: f322382c5c64a6e3d08479c557404fe1de0d3cf0
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
@@ -145,10 +145,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/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/branches/gcs-nio/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/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java b/branches/gcs-nio/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`	`}`