diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java index bbe24fbd4a..3e859560f1 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java @@ -64,6 +64,8 @@ public class WebSQLProcessor { private final SQLRuleManager ruleManager; private final Map contexts = new LinkedHashMap<>(); + private AtomicInteger contextId = new AtomicInteger(); + WebSQLProcessor(@NotNull WebSession webSession, @NotNull WebConnectionInfo connection) { this.webSession = webSession; this.connection = connection; @@ -108,10 +110,10 @@ public class WebSQLProcessor { @NotNull public WebSQLContextInfo createContext(String defaultCatalog, String defaultSchema) throws DBCException { - UUID uuid = UUID.randomUUID(); - WebSQLContextInfo contextInfo = new WebSQLContextInfo(this, uuid.toString(), defaultCatalog, defaultSchema); + String contextId = String.valueOf(this.contextId.incrementAndGet()); + WebSQLContextInfo contextInfo = new WebSQLContextInfo(this, contextId, defaultCatalog, defaultSchema); synchronized (contexts) { - contexts.put(uuid.toString(), contextInfo); + contexts.put(contextId, contextInfo); } return contextInfo; }