From 6864dbdbb21fe052465eb3fde57e82ac01e96683 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Fri, 11 Feb 2022 13:35:46 +0300 Subject: [PATCH] CB-1612 close result set after script execution --- .../cloudbeaver/service/sql/WebSQLProcessor.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 0ce78ef5f5..70e8ceae40 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 @@ -648,13 +648,14 @@ public class WebSQLProcessor implements WebSessionProvider { for (int i = 0; i < maxResultsCount; i++) { WebSQLQueryResults results = new WebSQLQueryResults(webSession, dataFormat); if (hasResultSet) { - DBCResultSet resultSet = dbStat.openResultSet(); - if (resultSet == null) { - break; - } - try (WebSQLQueryDataReceiver dataReceiver = new WebSQLQueryDataReceiver(contextInfo, dataContainer, dataFormat)) { - readResultSet(dbStat.getSession(), resultSet, webDataFilter, dataReceiver); - results.setResultSet(dataReceiver.getResultSet()); + try (DBCResultSet resultSet = dbStat.openResultSet()) { + if (resultSet == null) { + break; + } + try (WebSQLQueryDataReceiver dataReceiver = new WebSQLQueryDataReceiver(contextInfo, dataContainer, dataFormat)) { + readResultSet(dbStat.getSession(), resultSet, webDataFilter, dataReceiver); + results.setResultSet(dataReceiver.getResultSet()); + } } } else { long updateRowCount = dbStat.getUpdateRowCount();