Review feedback

jean-philippe-martin · jean-philippe-martin · commit 2fddc77eae2c · 2017-05-25T16:22:55.000-07:00
Also added a test for getCause().getCause()
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java
@@ -16,23 +16,22 @@
 
 package com.google.cloud.storage.contrib.nio;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.google.cloud.ReadChannel;
 import com.google.cloud.storage.BlobId;
 import com.google.cloud.storage.BlobInfo;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageException;
 
+import javax.annotation.CheckReturnValue;
+import javax.annotation.concurrent.ThreadSafe;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NonWritableChannelException;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.NoSuchFileException;
 
-import javax.annotation.CheckReturnValue;
-import javax.annotation.concurrent.ThreadSafe;
+import static com.google.common.base.Preconditions.checkArgument;
 
 /**
  * Cloud Storage read channel.
@@ -137,10 +136,15 @@ public int read(ByteBuffer dst) throws IOException {
   }
 
   private static boolean isReopenable(Throwable exs) {
-    return exs != null && (exs.getMessage().contains("Connection closed prematurely")
-            || exs.getCause() instanceof javax.net.ssl.SSLException
-            || exs.getCause() instanceof java.io.EOFException
-            || exs.getCause() instanceof java.net.SocketException);
+    while (exs != null) {
+      if (exs.getMessage().contains("Connection closed prematurely")
+          || exs.getCause() instanceof javax.net.ssl.SSLException
+          || exs.getCause() instanceof java.io.EOFException
+          || exs.getCause() instanceof java.net.SocketException
+          || exs.getCause() instanceof java.net.SocketTimeoutException) return true;
+      exs = exs.getCause();
+    }
+    return false;
   }
 
   private void sleepForAttempt(int attempt) {
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
@@ -38,6 +38,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
@@ -92,6 +93,18 @@ public void testReadRetry() throws IOException {
     verify(gcsChannel, times(2)).read(any(ByteBuffer.class));
   }
 
+  @Test
+  public void testReadRetrySSLHandshake() throws IOException {
+    ByteBuffer buffer = ByteBuffer.allocate(1);
+    when(gcsChannel.read(eq(buffer)))
+        .thenThrow(new StorageException(new IOException("something", new IOException("thing", new SSLHandshakeException("connection closed due to throttling")))))
+        .thenReturn(1);
+    assertThat(chan.position()).isEqualTo(0L);
+    assertThat(chan.read(buffer)).isEqualTo(1);
+    assertThat(chan.position()).isEqualTo(1L);
+    verify(gcsChannel, times(2)).read(any(ByteBuffer.class));
+  }
+
   @Test
   public void testReadRetryEventuallyGivesUp() throws IOException {
     ByteBuffer buffer = ByteBuffer.allocate(1);
