From 8f61dd20c15d9961ceb004049529722a46bec75d Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <denis.sinelnikov@dbaever.com>
Date: Fri, 16 Feb 2024 15:52:44 +0400
Subject: [PATCH 1/2] CB-4677. Refactor after review

---
 .../server/events/WSDeleteTempFileHandler.java        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
index 1a39f719c7..fffe75f29f 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
@@ -32,6 +32,7 @@ public class WSDeleteTempFileHandler implements WSEventHandler<WSEventDeleteTemp
 
     private static final Log log = Log.getLog(WSDeleteTempFileHandler.class);
     private static final String TEMP_FILE_FOLDER = "temp-sql-upload-files";
+    private static final String TEMP_FILE_TASK_FOLDER = "temp-task-folder";
 
     public void resetTempFolder(String sessionId) {
         Path path = CBPlatform.getInstance()
@@ -44,6 +45,16 @@ public void resetTempFolder(String sessionId) {
                 log.error("Error deleting temp path", e);
             }
         }
+        Path taskPath = CBPlatform.getInstance()
+                .getTempFolder(new VoidProgressMonitor(), TEMP_FILE_TASK_FOLDER)
+                .resolve(sessionId);
+        if (Files.exists(path)) {
+            try {
+                IOUtils.deleteDirectory(taskPath);
+            } catch (IOException e) {
+                log.error("Error deleting temp path", e);
+            }
+        }
     }
 
     @Override

From a2a1db8f386e53f21c30dcc92bccabb91fbd63ab Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <denis.sinelnikov@dbaever.com>
Date: Fri, 16 Feb 2024 16:59:33 +0400
Subject: [PATCH 2/2] CB-4677. Refactor after review

---
 .../server/events/WSDeleteTempFileHandler.java        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
index fffe75f29f..1a39f719c7 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSDeleteTempFileHandler.java
@@ -32,7 +32,6 @@ public class WSDeleteTempFileHandler implements WSEventHandler<WSEventDeleteTemp
 
     private static final Log log = Log.getLog(WSDeleteTempFileHandler.class);
     private static final String TEMP_FILE_FOLDER = "temp-sql-upload-files";
-    private static final String TEMP_FILE_TASK_FOLDER = "temp-task-folder";
 
     public void resetTempFolder(String sessionId) {
         Path path = CBPlatform.getInstance()
@@ -45,16 +44,6 @@ public void resetTempFolder(String sessionId) {
                 log.error("Error deleting temp path", e);
             }
         }
-        Path taskPath = CBPlatform.getInstance()
-                .getTempFolder(new VoidProgressMonitor(), TEMP_FILE_TASK_FOLDER)
-                .resolve(sessionId);
-        if (Files.exists(path)) {
-            try {
-                IOUtils.deleteDirectory(taskPath);
-            } catch (IOException e) {
-                log.error("Error deleting temp path", e);
-            }
-        }
     }
 
     @Override