Skip to content

Skip adding NullChangeToken instances to the composite list #115684

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
merged 3 commits into from
May 29, 2025
Merged

Skip adding NullChangeToken instances to the composite list #115684

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bde2cb1
Skip adding NullChangeToken instances to the composite list
rameel May 17, 2025
2fecedc
Address feedback
rameel May 18, 2025
41d83c0
Merge branch 'main' into ignore-nullchangetoken
stephentoub May 28, 2025
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
13 changes: 6 additions & 7 deletions src/libraries/Microsoft.Extensions.FileProviders.Composite/src/CompositeFileProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,18 @@ public IChangeToken Watch(string pattern)
foreach (IFileProvider fileProvider in _fileProviders)
{
IChangeToken changeToken = fileProvider.Watch(pattern);
if (changeToken != null)
if (changeToken is not null && changeToken is not NullChangeToken)
{
changeTokens.Add(changeToken);
}
}

// There is no change token with active change callbacks
if (changeTokens.Count == 0)
return changeTokens.Count switch
{
return NullChangeToken.Singleton;
}

return new CompositeChangeToken(changeTokens);
0 => NullChangeToken.Singleton,
1 => changeTokens[0],
_ => new CompositeChangeToken(changeTokens)
};
}

/// <summary>
Expand Down
Loading