[yql] Fix token resolver reset when hidden query is aborted

1 files changed, 4 insertions, 5 deletions

diff --git a/ydb/library/yql/core/facade/yql_facade.cpp b/ydb/library/yql/core/facade/yql_facade.cpp
index 76db0d5cd3..89cdb29b36 100644
--- a/ydb/library/yql/core/facade/yql_facade.cpp
+++ b/ydb/library/yql/core/facade/yql_facade.cpp
@@ -281,6 +281,10 @@ TProgram::TProgram(
 TProgram::~TProgram() {
     try {
         CloseLastSession();
+        // Token resolver may keep some references to provider internal's. So reset it to release provider's data
+        if (FileStorage_) {
+            FileStorage_->SetTokenResolver({});
+        }
         // stop all non complete execution before deleting TExprCtx
         DataProviders_.clear();
     } catch (...) {
@@ -1269,11 +1273,6 @@ void TProgram::CloseLastSession() {
             dp.CloseSession(sessionId);
         }
     }
-
-    // Token resolver may keep some references to provider internal's. So reset it to release provider's data
-    if (FileStorage_) {
-        FileStorage_->SetTokenResolver({});
-    }
 }
 
 TString TProgram::ResultsAsString() const {