Merge branch 'devel' into dbeaver/dbeaver-vscode#7-drivers-download

dbeaver · Nov 22, 2024 · 341ee7c · 341ee7c
2 parents a828bb3 + 350136f
commit 341ee7c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java b/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java
@@ -16,10 +16,12 @@
  */
 package io.cloudbeaver.server.graphql;
 
+import io.cloudbeaver.model.app.BaseWebApplication;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import jakarta.servlet.http.HttpServletRequest;
+import org.jkiss.code.Nullable;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.Map;
@@ -51,13 +53,18 @@ public static String getSessionId(HttpServletRequest request) {
         return session.getUserContext().getSmSessionId();
     }
 
+    @Nullable
     private static WebSession getWebSession(HttpServletRequest request) {
         if (request.getSession() == null) {
             return null;
         }
-        return (WebSession) CBApplication.getInstance()
-            .getSessionManager()
-            .getSession(request.getSession().getId());
+
+        if (BaseWebApplication.getInstance() instanceof CBApplication<?> cbApp) {
+            return (WebSession)cbApp.getSessionManager()
+                .getSession(request.getSession().getId());
+        } else {
+            return null;
+        }
     }
 
     public static String buildLoggerMessage(String sessionId, String userId, Map<String, Object> variables) {