Skip to content
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

Jump to bottom

Fix NamespaceCache usage in System.Private.Xml.Linq #101158

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Fix NamespaceCache usage in System.Private.Xml.Linq #101158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b75b5
Update XContainer.cs
hamarb123 Apr 17, 2024
c8bd09d
Merge branch 'main' into main15
stephentoub Jul 22, 2024
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
4 changes: 2 additions & 2 deletions src/libraries/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,8 @@ internal async Task ReadContentFromAsync(XmlReader r, LoadOptions o, Cancellatio

private sealed class ContentReader
{
private readonly NamespaceCache _eCache;
private readonly NamespaceCache _aCache;
private NamespaceCache _eCache;
private NamespaceCache _aCache;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this occurred as part of moving these from being locals to being fields as part of d88ba5b#diff-b2b608017bdbacf5e4484368d6e1fcb03a9ea3b68f4aece41da253f72826acf9R908. Would they be better again as locals? I'm not sure why they were moved to be fields, but they're increasing the size of the ContentReader object by being here.
cc: @krwq

private readonly IXmlLineInfo? _lineInfo;
private XContainer _currentContainer;
private string? _baseUri;
Expand Down
Loading