Merge 7711420 into 61ea2b9

olavloite · web-flow · commit 6c143743ec26 · 2021-02-01T13:50:22.000Z
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -463,7 +463,10 @@ TransactionSelector getTransactionSelector() {
             // Aborted error if the call that included the BeginTransaction option fails. The
             // Aborted error will cause the entire transaction to be retried, and the retry will use
             // a separate BeginTransaction RPC.
-            TransactionSelector.newBuilder()
+            // If tx.get() returns successfully, this.transactionId will also have been set to a
+            // valid value as the latter is always set when a transaction id is returned by a
+            // statement.
+            return TransactionSelector.newBuilder()
                 .setId(tx.get(waitForTransactionTimeoutMillis, TimeUnit.MILLISECONDS))
                 .build();
           }
