Merge branch 'main' into last-statement

Author: olavloite

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

README.md

@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.53.0')
+implementation platform('com.google.cloud:libraries-bom:26.54.0')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```

generation_config.yaml

@@ -1,6 +1,6 @@
-gapic_generator_version: 2.52.0
-googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae
-libraries_bom_version: 26.53.0
+gapic_generator_version: 2.53.0
+googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
+libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: spanner
     name_pretty: Cloud Spanner

google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java

@@ -80,6 +80,13 @@ public void commit() {
     } catch (SpannerException e2) {
       txnState = TransactionState.COMMIT_FAILED;
       throw e2;
+    } finally {
+      // At this point, if the TransactionState is not ABORTED, then the transaction has reached an
+      // end state.
+      // We can safely call close() to release resources.
+      if (getState() != TransactionState.ABORTED) {
+        close();
+      }
     }
   }
 
@@ -92,6 +99,9 @@ public void rollback() {
       txn.rollback();
     } finally {
       txnState = TransactionState.ROLLED_BACK;
+      // At this point, the TransactionState is ROLLED_BACK which is an end state.
+      // We can safely call close() to release resources.
+      close();
     }
   }