From 7249a689c80e0d81d514af723b23ee168d514c0b Mon Sep 17 00:00:00 2001
From: Iliar Turdushev <iliarturdu@microsoft.com>
Date: Fri, 20 Sep 2024 15:24:44 +0200
Subject: [PATCH 1/2] Fixes #2299

Adds logic handling a case when the value being requested is null
---
 src/Polly.Core/ResilienceProperties.cs        | 14 ++++++++---
 .../ResiliencePropertiesTests.cs              | 23 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Polly.Core/ResilienceProperties.cs b/src/Polly.Core/ResilienceProperties.cs
index 466901436a..e8cd9cfbb6 100644
--- a/src/Polly.Core/ResilienceProperties.cs
+++ b/src/Polly.Core/ResilienceProperties.cs
@@ -20,10 +20,18 @@ public sealed class ResilienceProperties
     /// <returns>True, if a property was retrieved.</returns>
     public bool TryGetValue<TValue>(ResiliencePropertyKey<TValue> key, [MaybeNullWhen(false)] out TValue value)
     {
-        if (Options.TryGetValue(key.Key, out object? val) && val is TValue typedValue)
+        if (Options.TryGetValue(key.Key, out object? val))
         {
-            value = typedValue;
-            return true;
+            if (val is TValue typedValue)
+            {
+                value = typedValue;
+                return true;
+            }
+            else if (val == null)
+            {
+                value = default!;
+                return true;
+            }
         }
 
         value = default;
diff --git a/test/Polly.Core.Tests/ResiliencePropertiesTests.cs b/test/Polly.Core.Tests/ResiliencePropertiesTests.cs
index e4ef2c31ba..45e97016b7 100644
--- a/test/Polly.Core.Tests/ResiliencePropertiesTests.cs
+++ b/test/Polly.Core.Tests/ResiliencePropertiesTests.cs
@@ -14,6 +14,18 @@ public void TryGetValue_Ok()
         val.Should().Be(12345);
     }
 
+    [Fact]
+    public void TryGetValue_ValueIsNull_Ok()
+    {
+        var key = new ResiliencePropertyKey<string?>("dummy");
+        var props = new ResilienceProperties();
+
+        props.Set(key, null);
+
+        props.TryGetValue(key, out var val).Should().Be(true);
+        val.Should().Be(null);
+    }
+
     [Fact]
     public void TryGetValue_NotFound_Ok()
     {
@@ -34,6 +46,17 @@ public void GetValue_Ok()
         props.GetValue(key, default).Should().Be(12345);
     }
 
+    [Fact]
+    public void GetValue_ValueIsNull_Ok()
+    {
+        var key = new ResiliencePropertyKey<string?>("dummy");
+        var props = new ResilienceProperties();
+
+        props.Set(key, null);
+
+        props.GetValue(key, "default").Should().Be(null);
+    }
+
     [Fact]
     public void GetValue_NotFound_EnsureDefault()
     {

From 864e2ebc66a011dec2f8a15741b4b9ff30b8f02e Mon Sep 17 00:00:00 2001
From: Iliar Turdushev <iliarturdu@microsoft.com>
Date: Fri, 20 Sep 2024 19:31:19 +0200
Subject: [PATCH 2/2] Replaces "val == null" with "val is null"

---
 src/Polly.Core/ResilienceProperties.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Polly.Core/ResilienceProperties.cs b/src/Polly.Core/ResilienceProperties.cs
index e8cd9cfbb6..6866be4a19 100644
--- a/src/Polly.Core/ResilienceProperties.cs
+++ b/src/Polly.Core/ResilienceProperties.cs
@@ -27,7 +27,7 @@ public bool TryGetValue<TValue>(ResiliencePropertyKey<TValue> key, [MaybeNullWhe
                 value = typedValue;
                 return true;
             }
-            else if (val == null)
+            else if (val is null)
             {
                 value = default!;
                 return true;