From 525b1bf88dc511a6217fcd8db9f49e24e563dc66 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Wed, 15 Sep 2021 07:51:49 -0300 Subject: [PATCH] Revert "Wait for submitted threads to end before terminating a command line procedure. (#446)" This reverts commit 0c16769255f9da80096bbc94a4fa36baec0ee7d5. --- .../GxClasses/Core/GXApplication.cs | 2 +- .../dotnetframework/GxClasses/Model/gxproc.cs | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs b/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs index 35abf12f4..8af872987 100644 --- a/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs +++ b/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs @@ -3410,7 +3410,7 @@ public IGxSession GetSession() } internal bool IsStandalone => this._session is GxSession || this._isSumbited || this.HttpContext == null; - internal bool IsSubmited => this._isSumbited; + internal void SetSession(IGxSession value) { if (value != null) diff --git a/dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs b/dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs index 3ab98ae8a..853f2b4a0 100644 --- a/dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs +++ b/dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs @@ -42,7 +42,7 @@ public abstract class GXProcedure: GXBaseObject protected string Gx_out = ""; protected string Gx_docfmt = ""; protected string Gx_docname = ""; - const int SLEEP_BETWEEN_CHECKS_ON_THREADS = 500; + public const int IN_NEW_UTL = -2; private bool disconnectUserAtCleanup; #if !NETCORE @@ -90,9 +90,6 @@ protected void exitApplication() } private void exitApplication(bool flushBatchCursor) { - if (IsMain && !(context as GxContext).IsSubmited) - WaitForThreadPoolEnd(); - if (flushBatchCursor) { foreach (IGxDataStore ds in context.DataStores) @@ -117,19 +114,6 @@ private void exitApplication(bool flushBatchCursor) #endif } - void WaitForThreadPoolEnd() - { - bool working = true; - ThreadPool.GetMaxThreads(out int maxWorkerThreads, out _); - while (working) - { - ThreadPool.GetAvailableThreads(out int workerThreads, out _); - if (workerThreads == maxWorkerThreads) - working = false; - else - Thread.Sleep(SLEEP_BETWEEN_CHECKS_ON_THREADS); - } - } protected virtual bool BatchCursorHolder() { return false; } protected virtual void printHeaders(){} protected virtual void printFooters(){}