From 8cff50b0cf9a72a1fbcd65895524d50d07ba3dde Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 2 Apr 2026 11:54:52 +0200
Subject: [PATCH] dbeaver/pro#8894 Workspace dispose and session cleanup fixes
 (#4256)

* dbeaver/pro#8894 Workspace dispose and session cleanup fixes

* dbeaver/pro#8894 Fix session cleanup

* Revert "dbeaver/pro#8894 Fix session cleanup"

This reverts commit 170882f69d9987e346a1e918d7efbb50249e4c15.

* dbeaver/pro#8894 Fix session cleanup
---
 .../src/io/cloudbeaver/model/session/BaseWebSession.java   | 7 ++++---
 .../src/io/cloudbeaver/model/session/WebSession.java       | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
index 2a210f9f7a..5bc215a7d4 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     }
 
     protected synchronized void clearSessionContext() {
-        this.workspace.getAuthContext().clear();
+        this.workspace.getAuthContext().clearContext(false);
         this.workspace.getAuthContext().addSession(this);
     }
 
@@ -187,12 +187,13 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
 
     @Override
     public void close() {
-        super.close();
         cleanUpSession(true);
+        super.close();
     }
 
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         cleanUpSession(sendSessionExpiredEvent);
+        super.close();
     }
 
     private void cleanUpSession(boolean sendSessionExpiredEvent) {
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index 1dad4b17e5..ca3921cd3e 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -492,7 +492,6 @@ public class WebSession extends BaseWebSession
     public void close() {
         try {
             resetNavigationModel();
-            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }
@@ -509,7 +508,6 @@ public class WebSession extends BaseWebSession
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         try {
             resetNavigationModel();
-            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }