Merge pull request #3847 from dibyang/raw_master

Fix the NullPointerException caused by accessing 'user' after the ses…
h2database · Jul 24, 2023 · 8e3d87d · 8e3d87d
2 parents b251b85 + 574e511
commit 8e3d87d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/h2/src/main/org/h2/table/InformationSchemaTable.java b/h2/src/main/org/h2/table/InformationSchemaTable.java
@@ -2847,11 +2847,16 @@ private void sessions(SessionLocal session, ArrayList<Row> rows, SessionLocal s)
         NetworkConnectionInfo networkConnectionInfo = s.getNetworkConnectionInfo();
         Command command = s.getCurrentCommand();
         int blockingSessionId = s.getBlockingSessionId();
+        User user = s.getUser();
+        if (user == null) {
+            // Session was closed concurrently
+            return;
+        }
         add(session, rows,
                 // SESSION_ID
                 ValueInteger.get(s.getId()),
                 // USER_NAME
-                s.getUser().getName(),
+                user.getName(),
                 // SERVER
                 networkConnectionInfo == null ? null : networkConnectionInfo.getServer(),
                 // CLIENT_ADDR