Fix potential ArgumentException with ConditionalWeakTable

Author: gpetrou

src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading;
@@ -24,6 +25,8 @@ internal sealed class DefaultRequestResponseSerializer : SystemTextJsonSerialize
 {
 	private readonly IElasticsearchClientSettings _settings;
 
+	private readonly object _lock = new();
+
 	public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings) :
 		base(new DefaultRequestResponseSerializerOptionsProvider(settings))
 	{
@@ -62,14 +65,17 @@ 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 _))
+		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);
+			}
 		}
 	}
 }

src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs

@@ -21,6 +21,8 @@ namespace Elastic.Clients.Elasticsearch.Serialization;
 public class DefaultSourceSerializer :
 	SystemTextJsonSerializer
 {
+	private readonly object _lock = new();
+
 	/// <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"/>.
@@ -43,14 +45,17 @@ private void LinkSettings(IElasticsearchClientSettings settings)
 		var options = GetJsonSerializerOptions(SerializationFormatting.None);
 		var indentedOptions = GetJsonSerializerOptions(SerializationFormatting.Indented);
 
-		if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
+		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);
+			}
 		}
 	}
 }