---

shinfan · web-flow · commit a3c0e0f374f6 · 2017-04-19T17:13:13.000-04:00
yaml --- r: 5597 b: refs/heads/master c: cc6415e h: refs/heads/master i: 5595: ba9fb31
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0c2a6cdff4f03ddb3edf348a80df4a2b5b302a00
+refs/heads/master: cc6415e9f9c1f88119588ba1b09444fa06a2ae0a
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: 049a9668af6afce3b5840dee8be005b0e6b43506
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java b/trunk/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;
   }
