chore: check that the session has a lastUseTime (#3363)

googleapis · Oct 2, 2024 · 84943da · 84943da
1 parent 38dc14a
commit 84943da
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
@@ -2083,7 +2083,8 @@ private void removeIdleSessions(Instant currTime) {
         Iterator<PooledSession> iterator = sessions.descendingIterator();
         while (iterator.hasNext()) {
           PooledSession session = iterator.next();
-          if (session.delegate.getLastUseTime().isBefore(minLastUseTime)) {
+          if (session.delegate.getLastUseTime() != null
+              && session.delegate.getLastUseTime().isBefore(minLastUseTime)) {
             if (session.state != SessionState.CLOSING) {
               boolean isRemoved = removeFromPool(session);
               if (isRemoved) {
@@ -2676,7 +2677,8 @@ private Tuple<PooledSession, Integer> findSessionToKeepAlive(
         && (numChecked + numAlreadyChecked)
             < (options.getMinSessions() + options.getMaxIdleSessions() - numSessionsInUse)) {
       PooledSession session = iterator.next();
-      if (session.delegate.getLastUseTime().isBefore(keepAliveThreshold)) {
+      if (session.delegate.getLastUseTime() != null
+          && session.delegate.getLastUseTime().isBefore(keepAliveThreshold)) {
         iterator.remove();
         return Tuple.of(session, numChecked);
       }