Fix MsQuicConfiguration.GetConfigurationCacheEnabled (dotnet#101555)

matouskozak · Apr 30, 2024 · 0b12848 · 0b12848
1 parent c7d1727
commit 0b12848
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicConfiguration.Cache.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicConfiguration.Cache.cs
@@ -21,22 +21,23 @@ internal static partial class MsQuicConfiguration
     private const string DisableCacheCtxSwitch = "System.Net.Quic.DisableConfigurationCache";
 
     internal static bool ConfigurationCacheEnabled { get; } = GetConfigurationCacheEnabled();
+
     private static bool GetConfigurationCacheEnabled()
     {
         // AppContext switch takes precedence
         if (AppContext.TryGetSwitch(DisableCacheCtxSwitch, out bool value))
         {
             return !value;
         }
-        else
+        // check environment variable second
+        else if (Environment.GetEnvironmentVariable(DisableCacheEnvironmentVariable) is string envVar)
         {
-            // check environment variable
-            return
-                Environment.GetEnvironmentVariable(DisableCacheEnvironmentVariable) is string envVar &&
-                !(envVar == "1" || envVar.Equals("true", StringComparison.OrdinalIgnoreCase));
+            return !(envVar == "1" || envVar.Equals("true", StringComparison.OrdinalIgnoreCase));
         }
-    }
 
+        // enabled by default
+        return true;
+    }
     private static readonly ConcurrentDictionary<CacheKey, MsQuicConfigurationSafeHandle> s_configurationCache = new();
 
     private readonly struct CacheKey : IEquatable<CacheKey>