Skip to content

Potential promise context lost fix #4583 #4584

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

Open
Leinnan wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Potential promise context lost fix #4583 #4584

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d397d
Potential promise context lost fix
Leinnan Apr 24, 2026
eb680ca
Merge branch 'main' into fix/promiseFix
Leinnan Aug 26, 2026
e5fe74e
Apply feedback
Leinnan Aug 27, 2026
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
16 changes: 16 additions & 0 deletions cli/beamable.common/Runtime/Promise.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,23 @@ void ICriticalNotifyCompletion.UnsafeOnCompleted(Action continuation)

void INotifyCompletion.OnCompleted(Action continuation)
{
#if DISABLE_THREADING
((ICriticalNotifyCompletion)this).UnsafeOnCompleted(continuation);
#else
// Mirror TaskAwaiter.OnCompleted: flow ExecutionContext so AsyncLocal
// values set by the caller survive the await and are restored on the
// thread that resolves the promise.
var capturedContext = System.Threading.ExecutionContext.Capture();
if (capturedContext == null)
{
((ICriticalNotifyCompletion)this).UnsafeOnCompleted(continuation);
return;
}
((ICriticalNotifyCompletion)this).UnsafeOnCompleted(() =>
{
System.Threading.ExecutionContext.Run(capturedContext, s => ((Action)s)(), continuation);
});
Comment thread
Leinnan marked this conversation as resolved.
#endif
}

/// <summary>
Expand Down
Loading