---

cmaan · neozwu · commit 6f566075bb85 · 2017-08-02T10:00:57.000-07:00
yaml --- r: 8219 b: refs/heads/master c: c25af8d h: refs/heads/master i: 8217: 9cfe931 8215: 1d7d978
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 242e30c43e754ba4e0595110362bedb474672433
+refs/heads/master: c25af8d1d0c01351e4e57cdb91d786834486319f
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: 0114589947fea527ea3831330789accedbecf45c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/trunk/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
@@ -33,7 +33,7 @@ public class TransactionExceptionHandler {
         public RetryResult beforeEval(Exception exception) {
           if (exception instanceof DatastoreException) {
             DatastoreException e = getInnerException((DatastoreException) exception);
-            if (e.getCode() == ABORTED_CODE || e.getReason().equals("ABORTED")) {
+            if (e.getCode() == ABORTED_CODE || e.getReason()!=null && e.getReason().equals("ABORTED")) {
               return Interceptor.RetryResult.RETRY;
             }
           }
diff --git a/trunk/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/trunk/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
@@ -60,5 +60,15 @@ public void testShouldTry() {
 
     assertTrue(transactionHandler.shouldRetry(nestedDatastoreException, null));
     assertFalse(handler.shouldRetry(nestedDatastoreException, null));
+
+    DatastoreException nestedUserException =
+        new DatastoreException(
+            BaseServiceException.UNKNOWN_CODE,
+            "",
+            null,
+            new RuntimeException(""));
+
+    assertFalse(transactionHandler.shouldRetry(nestedUserException, null));
+    assertFalse(handler.shouldRetry(nestedDatastoreException, null));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class TransactionExceptionHandler {`
`33`	`33`	`public RetryResult beforeEval(Exception exception) {`
`34`	`34`	`if (exception instanceof DatastoreException) {`
`35`	`35`	`DatastoreException e = getInnerException((DatastoreException) exception);`
`36`		`- if (e.getCode() == ABORTED_CODE \|\| e.getReason().equals("ABORTED")) {`
	`36`	`+ if (e.getCode() == ABORTED_CODE \|\| e.getReason()!=null && e.getReason().equals("ABORTED")) {`
`37`	`37`	`return Interceptor.RetryResult.RETRY;`
`38`	`38`	`}`
`39`	`39`	`}`