Skip to content

CSHARP-5633: BsonSerializer.IsTypeDiscriminated is not thread-safe #1722

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 3 commits into from
Jul 16, 2025
Merged

CSHARP-5633: BsonSerializer.IsTypeDiscriminated is not thread-safe #1722

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb0c10d
CSHARP-5633: BsonSerializer.IsTypeDiscriminated is not thread-safe
papafe Jul 10, 2025
17d1324
Small fix
papafe Jul 14, 2025
ea36b32
Small corrections
papafe Jul 15, 2025
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: 14 additions & 2 deletions src/MongoDB.Bson/Serialization/BsonSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,20 @@ internal static bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type)
/// <returns>True if the type is discriminated.</returns>
public static bool IsTypeDiscriminated(Type type)
{
var typeInfo = type.GetTypeInfo();
return typeInfo.IsInterface || __discriminatedTypes.Contains(type);
if (type.GetTypeInfo().IsInterface)
{
return true;
}

__configLock.EnterReadLock();
Copy link
Member

@sanych-sun sanych-sun Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please double-check if introducing this synchronization affects performance. If so, we could replace HashSet<Type> with ConcurrentDictionary<Type, bool>.

Copy link
Contributor Author

@papafe papafe Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it to use a ConcurrentDictionary, thanks for taking time to do the benchmarks :)

try
{
return __discriminatedTypes.Contains(type);
}
finally
{
__configLock.ExitReadLock();
}
}

/// <summary>
Expand Down