Spanner: Close ResultSet from session keep-alive request (#6331)

Fixes #6330 Closing the ResultSet also closes the span associated with the keep-alive request, which fixes a tracing issue.
googleapis · Oct 2, 2019 · 758cfd6 · 758cfd6
1 parent 620af66
commit 758cfd6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
@@ -796,10 +796,12 @@ public void prepareReadWriteTransaction() {
 
     private void keepAlive() {
       markUsed();
-      delegate
-          .singleUse(TimestampBound.ofMaxStaleness(60, TimeUnit.SECONDS))
-          .executeQuery(Statement.newBuilder("SELECT 1").build())
-          .next();
+      try (ResultSet resultSet =
+          delegate
+              .singleUse(TimestampBound.ofMaxStaleness(60, TimeUnit.SECONDS))
+              .executeQuery(Statement.newBuilder("SELECT 1").build())) {
+        resultSet.next();
+      }
     }
 
     private void markUsed() {