transactionManager ex: tolerate aborts during read (googleapis#7188)

clifffrey · web-flow · commit 42a5f456ad05 · 2020-04-22T12:00:53.000+10:00
It is possible that txn.readRow can return an aborted error, and thus the try/catch should wrap that as well, instead of just the commit operation.
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/spanner/snippets/DatabaseClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/spanner/snippets/DatabaseClientSnippets.java
@@ -215,11 +215,12 @@ public void transactionManager(final long singerId) throws InterruptedException
     try (TransactionManager manager = dbClient.transactionManager()) {
       TransactionContext txn = manager.begin();
       while (true) {
-        String column = "FirstName";
-        Struct row = txn.readRow("Singers", Key.of(singerId), Collections.singleton(column));
-        String name = row.getString(column);
-        txn.buffer(Mutation.newUpdateBuilder("Singers").set(column).to(name.toUpperCase()).build());
         try {
+          String column = "FirstName";
+          Struct row = txn.readRow("Singers", Key.of(singerId), Collections.singleton(column));
+          String name = row.getString(column);
+          txn.buffer(
+              Mutation.newUpdateBuilder("Singers").set(column).to(name.toUpperCase()).build());
           manager.commit();
           break;
         } catch (AbortedException e) {
