Handle InterruptedException

jean-philippe-martin · jean-philippe-martin · commit c54a4f659f6e · 2016-12-01T12:47:17.000-08:00
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java
@@ -191,6 +191,7 @@ public int read(ByteBuffer dst) throws IOException {
     try {
       src = fetch(position);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       return 0;
     } catch (ExecutionException e) {
       throw new RuntimeException(e);
@@ -341,11 +342,12 @@ public void close() throws IOException {
           }
         }
       } catch (InterruptedException e) {
-        System.out.println("Timed out while waiting for channels to close.");
+        Thread.currentThread().interrupt();
       }
       try {
         exec.awaitTermination(60, TimeUnit.SECONDS);
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         exec.shutdownNow();
       }
       // Close all underlying channels

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ public int read(ByteBuffer dst) throws IOException {`
`191`	`191`	`try {`
`192`	`192`	`src = fetch(position);`
`193`	`193`	`} catch (InterruptedException e) {`
	`194`	`+ Thread.currentThread().interrupt();`
`194`	`195`	`return 0;`
`195`	`196`	`} catch (ExecutionException e) {`
`196`	`197`	`throw new RuntimeException(e);`
`@@ -341,11 +342,12 @@ public void close() throws IOException {`
`341`	`342`	`}`
`342`	`343`	`}`
`343`	`344`	`} catch (InterruptedException e) {`
`344`		`- System.out.println("Timed out while waiting for channels to close.");`
	`345`	`+ Thread.currentThread().interrupt();`
`345`	`346`	`}`
`346`	`347`	`try {`
`347`	`348`	`exec.awaitTermination(60, TimeUnit.SECONDS);`
`348`	`349`	`} catch (InterruptedException e) {`
	`350`	`+ Thread.currentThread().interrupt();`
`349`	`351`	`exec.shutdownNow();`
`350`	`352`	`}`
`351`	`353`	`// Close all underlying channels`