From c46238a3a08c03096ea810b5dfd53dd96a1d47a8 Mon Sep 17 00:00:00 2001
From: Florian Bernd <florian.bernd@elastic.co>
Date: Thu, 28 Nov 2024 09:08:01 +0100
Subject: [PATCH] Fix `RequestConfiguration`
---
.../_Shared/Core/Request/RequestDescriptor.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Request/RequestDescriptor.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Request/RequestDescriptor.cs
index 05723aa785..157552162a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Request/RequestDescriptor.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Request/RequestDescriptor.cs
@@ -59,8 +59,9 @@ protected TDescriptor Qs(string name, IStringable value)
/// </summary>
public TDescriptor RequestConfiguration(Func<RequestConfigurationDescriptor, IRequestConfiguration> configurationSelector)
{
- var rc = RequestConfig;
- RequestConfig = configurationSelector?.Invoke(new RequestConfigurationDescriptor(rc)) ?? rc;
+ RequestConfig = configurationSelector?.Invoke(RequestConfig is null
+ ? new RequestConfigurationDescriptor()
+ : new RequestConfigurationDescriptor(RequestConfig)) ?? RequestConfig;
return _descriptor;
}