admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NullReferenceException in DSC ClearCache() (#15373)

Browse Source
This commit is contained in:
Andrew
2021-05-12 13:30:43 -07:00
committed by GitHub
parent 0dcb3a06dd
commit ae772462a5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/DscSupport/JsonDscClassCache.cs
+10 -5
View File
@@ -99,9 +99,14 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal.CrossPlatform
private static readonly HashSet<string> s_hiddenResourceCache =
new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "MSFT_BaseConfigurationProviderRegistration", "MSFT_CimConfigurationProviderRegistration", "MSFT_PSConfigurationProviderRegistration" };
// A collection to prevent circular importing case when Import-DscResource does not have a module specified
/// <summary>
/// Gets a collection to prevent circular importing case when Import-DscResource does not have a module specified.
/// </summary>
private static HashSet<string> CurrentImportDscResourceInvocations
=> t_currentImportDscResourceInvocations ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
[ThreadStatic]
private static readonly HashSet<string> t_currentImportDscResourceInvocations = new(StringComparer.OrdinalIgnoreCase);
private static HashSet<string> t_currentImportDscResourceInvocations;
/// <summary>
/// Gets DSC class cache for this runspace.
@@ -361,7 +366,7 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal.CrossPlatform
ClassCache.Clear();
ByClassModuleCache.Clear();
CacheResourcesFromMultipleModuleVersions = false;
t_currentImportDscResourceInvocations.Clear();
CurrentImportDscResourceInvocations.Clear();
}
private static string GetModuleQualifiedResourceName(string moduleName, string moduleVersion, string className, string resourceName)
@@ -1140,9 +1145,9 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal.CrossPlatform
// Lookup the required resources under available PowerShell modules when modulename is not specified
// Make sure that this is not a circular import/parsing
var callLocation = string.Join(':', scriptExtent.File, scriptExtent.StartLineNumber, scriptExtent.StartColumnNumber, scriptExtent.Text);
if (!t_currentImportDscResourceInvocations.Contains(callLocation))
if (!CurrentImportDscResourceInvocations.Contains(callLocation))
{
t_currentImportDscResourceInvocations.Add(callLocation);
CurrentImportDscResourceInvocations.Add(callLocation);
using (var powerShell = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace))
{
powerShell.AddCommand("Get-Module");