Skip to content

Waiting for submitted threads to end is limited now to command line context #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Waiting for submitted threads to end is limited now to command line context #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5821,9 +5821,20 @@ internal static void Submit(WaitCallback callbak, object state)
ThreadPool.QueueUserWorkItem(
arg =>
{
callbak(state);
resetEvent.Set();
events.TryRemove(eventGuid, out ManualResetEvent _);
try
{
callbak(state);
}
catch (Exception ex)
{
GXLogging.Error(log, "Error on submit of " + state.GetType(), ex);
throw;
}
finally
{
resetEvent.Set();
events.TryRemove(eventGuid, out ManualResetEvent _);
}

});
events[eventGuid]= resetEvent;
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected void exitApplication()
}
private void exitApplication(bool flushBatchCursor)
{
if (IsMain && !(context as GxContext).IsSubmited)
if (!(GxContext.IsHttpContext || GxContext.IsRestService) && IsMain && !(context as GxContext).IsSubmited)
ThreadUtil.WaitForEnd();

if (flushBatchCursor)
Expand Down