---

mziccard · mziccard · commit a83b79d0da58 · 2016-01-20T23:19:38.000+01:00
yaml --- r: 6765 b: refs/heads/tswast-patch-1 c: 3c81f16 h: refs/heads/master i: 6763: f7c3a56
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: 34e6806becf14f1b9bf0aeac1f7cc11d2aad95b1
+refs/heads/tswast-patch-1: 3c81f1679e7f6880d9f3c4a9b89a5831c90fb02f
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -58,6 +58,16 @@ public String reason() {
       return reason;
     }
 
+    boolean isRetryable(Set<Error> retryableErrors) {
+      for (Error retryableError : retryableErrors) {
+        if ((retryableError.code() == null || retryableError.code().equals(this.code()))
+            && (retryableError.reason() == null || retryableError.reason().equals(this.reason()))) {
+          return true;
+        }
+      }
+      return false;
+    }
+
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this).add("code", code).add("reason", reason).toString();
@@ -83,7 +93,7 @@ public BaseServiceException(IOException exception, boolean idempotent) {
       Error error = error(((GoogleJsonResponseException) exception).getDetails());
       this.code = error.code;
       this.reason = error.reason;
-      this.retryable = isRetryable(error);
+      this.retryable = error.isRetryable(retryableErrors());
     } else {
       this.code = UNKNOWN_CODE;
       this.reason = null;
@@ -110,15 +120,15 @@ public BaseServiceException(int code, String message, String reason, boolean ide
     this.code = code;
     this.reason = reason;
     this.idempotent = idempotent;
-    this.retryable = idempotent && isRetryable(new Error(code, reason));
+    this.retryable = idempotent && new Error(code, reason).isRetryable(retryableErrors());
   }
 
   protected Set<Error> retryableErrors() {
     return Collections.emptySet();
   }
 
   protected boolean isRetryable(GoogleJsonError error) {
-    return error != null && isRetryable(error(error));
+    return error != null && error(error).isRetryable(retryableErrors());
   }
 
   protected boolean isRetryable(IOException exception) {
@@ -128,16 +138,6 @@ protected boolean isRetryable(IOException exception) {
     return exception instanceof SocketTimeoutException;
   }
 
-  protected boolean isRetryable(Error error) {
-    for (Error retryableError : retryableErrors()) {
-      if ((retryableError.code() == null || retryableError.code().equals(error.code()))
-          && (retryableError.reason() == null || retryableError.reason().equals(error.reason()))) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Returns the code associated with this exception.
    */
