---

cmaan · neozwu · commit 934293b9a3d0 · 2017-08-02T10:00:57.000-07:00
yaml --- r: 8319 b: refs/heads/snehashah-snippets c: c25af8d h: refs/heads/master i: 8317: 8a2d4e7 8315: 117a655 8311: 48d5d23 8303: a63f59a 8287: 6549fc7 8255: 54e215d 8191: 8fe6b6e
diff --git a/[refs] b/[refs]
@@ -56,7 +56,7 @@ 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/snehashah-snippets: 242e30c43e754ba4e0595110362bedb474672433
+refs/heads/snehashah-snippets: c25af8d1d0c01351e4e57cdb91d786834486319f
 refs/tags/v0.20.2: 5a53aa06f268b74dc192204f4f83e1a04d40f65d
 refs/tags/v0.20.3: 269025fdc14af0b68df214a4518be5379b2fe569
 refs/tags/v0.21.0: f88b200e00e41ba6262ee88a92abba38b1e2417e
diff --git a/branches/snehashah-snippets/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/branches/snehashah-snippets/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/branches/snehashah-snippets/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/branches/snehashah-snippets/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`	`}`