🚑 fix NullPointerException (#2256)

cmaan · cmaan · commit 0d90aed795d5 · 2017-07-25T15:52:12.000+02:00
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/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/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/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`	`}`