Skip to content

Fix race condition in RuntimeProperty.Sentinel #36529

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
AndriySvyryd merged 1 commit into from
Aug 8, 2025
Merged

Fix race condition in RuntimeProperty.Sentinel #36529

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
9 changes: 5 additions & 4 deletions src/EFCore/Metadata/RuntimeProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class RuntimeProperty : RuntimePropertyBase, IRuntimeProperty
private readonly ValueGenerated _valueGenerated;
private readonly bool _isConcurrencyToken;
private object? _sentinel;
private object? _sentinelFromProviderValue;
private volatile object? _sentinelFromProviderValue;
private readonly PropertySaveBehavior _beforeSaveBehavior;
private readonly PropertySaveBehavior _afterSaveBehavior;
private readonly Func<IProperty, ITypeBase, ValueGenerator>? _valueGeneratorFactory;
Expand Down Expand Up @@ -335,11 +335,12 @@ public override object? Sentinel
{
get
{
if (_sentinelFromProviderValue != null)
var providerValue = _sentinelFromProviderValue;
if (providerValue != null)
{
var providerValue = _sentinelFromProviderValue;
Interlocked.CompareExchange(ref _sentinel, TypeMapping.Converter!.ConvertFromProvider(providerValue), null);

_sentinelFromProviderValue = null;
_sentinel = TypeMapping.Converter!.ConvertFromProvider(providerValue);
}

return _sentinel;
Expand Down
Loading