Skip to content
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

Fix potential ArgumentException with ConditionalWeakTable #8444

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Fix potential ArgumentException with ConditionalWeakTable #8444

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
26 changes: 19 additions & 7 deletions src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ internal sealed class DefaultRequestResponseSerializer : SystemTextJsonSerialize
{
private readonly IElasticsearchClientSettings _settings;

#if !NET8_0_OR_GREATER
private readonly object _lock = new();
#endif

public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings) :
base(new DefaultRequestResponseSerializerOptionsProvider(settings))
{
Expand Down Expand Up @@ -62,15 +66,23 @@ private void LinkSettings(IElasticsearchClientSettings settings)
var options = GetJsonSerializerOptions(SerializationFormatting.None);
var indentedOptions = GetJsonSerializerOptions(SerializationFormatting.Indented);

if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
{
ElasticsearchClient.SettingsTable.Add(options, settings);
}

if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
#if NET8_0_OR_GREATER
ElasticsearchClient.SettingsTable.TryAdd(options, settings);
ElasticsearchClient.SettingsTable.TryAdd(indentedOptions, settings);
#else
lock (_lock)
{
ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
{
ElasticsearchClient.SettingsTable.Add(options, settings);
}

if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
{
ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
}
}
#endif
}
}

Expand Down
24 changes: 18 additions & 6 deletions src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ namespace Elastic.Clients.Elasticsearch.Serialization;
public class DefaultSourceSerializer :
SystemTextJsonSerializer
{
#if !NET8_0_OR_GREATER
private readonly object _lock = new();
#endif

/// <summary>
/// Constructs a new <see cref="DefaultSourceSerializer"/> instance that accepts an <see cref="Action{T}"/> that can
/// be provided to customize the default <see cref="JsonSerializerOptions"/>.
Expand All @@ -43,15 +47,23 @@ private void LinkSettings(IElasticsearchClientSettings settings)
var options = GetJsonSerializerOptions(SerializationFormatting.None);
var indentedOptions = GetJsonSerializerOptions(SerializationFormatting.Indented);

if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
#if NET8_0_OR_GREATER
ElasticsearchClient.SettingsTable.TryAdd(options, settings);
ElasticsearchClient.SettingsTable.TryAdd(indentedOptions, settings);
#else
lock (_lock)
{
ElasticsearchClient.SettingsTable.Add(options, settings);
}
if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
{
ElasticsearchClient.SettingsTable.Add(options, settings);
}

if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
{
ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
{
ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
}
}
#endif
}
}

Expand Down
Loading