---

mziccard · mziccard · commit 88da521dfc7b · 2016-01-20T23:19:38.000+01:00
yaml --- r: 2711 b: refs/heads/update-datastore c: 3c81f16 h: refs/heads/master i: 2709: cb97c07 2707: 00b1a13 2703: c14a5c9
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 34e6806becf14f1b9bf0aeac1f7cc11d2aad95b1
+refs/heads/update-datastore: 3c81f1679e7f6880d9f3c4a9b89a5831c90fb02f
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/branches/update-datastore/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.
    */
