From 417cbd7a677eee1b08134d40a861cc558fdcaf66 Mon Sep 17 00:00:00 2001 From: Ilya Date: Fri, 1 Nov 2019 22:39:41 +0500 Subject: [PATCH] Return default value when getting 'null' for a setting in `PSConfiguration.cs` (#10963) --- src/System.Management.Automation/engine/PSConfiguration.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Management.Automation/engine/PSConfiguration.cs b/src/System.Management.Automation/engine/PSConfiguration.cs index 17ac504dcb5..a52b7dfe75f 100644 --- a/src/System.Management.Automation/engine/PSConfiguration.cs +++ b/src/System.Management.Automation/engine/PSConfiguration.cs @@ -439,7 +439,7 @@ private T ReadValueFromFile(ConfigScope scope, string key, T defaultValue = d if (configData != emptyConfig && configData.TryGetValue(key, StringComparison.OrdinalIgnoreCase, out JToken jToken)) { - return jToken.ToObject(serializer); + return jToken.ToObject(serializer) ?? defaultValue; } return defaultValue;