---

shinfan · web-flow · commit caea872787c0 · 2017-04-19T17:13:13.000-04:00
yaml --- r: 8009 b: refs/heads/tswast-patch-1 c: cc6415e h: refs/heads/master i: 8007: cb4286f
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: 0c2a6cdff4f03ddb3edf348a80df4a2b5b302a00
+refs/heads/tswast-patch-1: cc6415e9f9c1f88119588ba1b09444fa06a2ae0a
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java
@@ -26,9 +26,11 @@
 import java.io.Serializable;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.security.cert.CertificateException;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
+import javax.net.ssl.SSLHandshakeException;
 
 /**
  * Base class for all service exceptions.
@@ -203,6 +205,8 @@ protected boolean isRetryable(boolean idempotent, Error error) {
   protected boolean isRetryable(boolean idempotent, IOException exception) {
     boolean exceptionIsRetryable = exception instanceof SocketTimeoutException
         || exception instanceof SocketException
+        || (exception instanceof SSLHandshakeException
+            && !(exception.getCause() instanceof CertificateException))
         || "insufficient data written".equals(exception.getMessage());
     return idempotent && exceptionIsRetryable;
   }
