Skip to content

Fix NullReferenceException in DSC ClearCache() #15373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmenaga merged 3 commits into from
May 12, 2021
Merged

Fix NullReferenceException in DSC ClearCache() #15373

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a4ffb4
Fix NullReferenceException related to CurrentImportDscResourceInvocat…
May 10, 2021
f943a51
Fixed CodeFactor
May 10, 2021
54b0a99
Simplified syntax for the property
May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/System.Management.Automation/DscSupport/JsonDscClassCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,14 @@ public static class DscClassCache
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.
Expand Down Expand Up @@ -361,7 +366,7 @@ public static void ClearCache()
ClassCache.Clear();
ByClassModuleCache.Clear();
CacheResourcesFromMultipleModuleVersions = false;
t_currentImportDscResourceInvocations.Clear();
CurrentImportDscResourceInvocations.Clear();
}

private static string GetModuleQualifiedResourceName(string moduleName, string moduleVersion, string className, string resourceName)
Expand Down Expand Up @@ -1140,9 +1145,9 @@ internal static void LoadResourcesFromModuleInImportResourcePostParse(
// 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");
Expand Down