fix: SessionNotFound was not retried for AsyncTransactionManager (#552)

googleapis · Oct 27, 2020 · 5969f83 · 5969f83
1 parent acf52a2
commit 5969f83
Show file tree

Hide file tree

Showing 6 changed files with 608 additions and 158 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java
@@ -66,7 +66,9 @@ public ApiFuture<Void> closeAsync() {
     if (txnState == TransactionState.STARTED) {
       res = rollbackAsync();
     }
-    txn.close();
+    if (txn != null) {
+      txn.close();
+    }
     return MoreObjects.firstNonNull(res, ApiFutures.<Void>immediateFuture(null));
   }
 
@@ -172,7 +174,7 @@ public ApiFuture<Void> apply(Empty input) throws Exception {
 
   @Override
   public TransactionContextFuture resetForRetryAsync() {
-    if (txn == null || !txn.isAborted() && txnState != TransactionState.ABORTED) {
+    if (txn == null || (!txn.isAborted() && txnState != TransactionState.ABORTED)) {
       throw new IllegalStateException(
           "resetForRetry can only be called if the previous attempt aborted");
     }