Skip to content

Fix ResourceManagerStringLocalizerFactory caching #33129

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 7 commits into from
Feb 28, 2022
Merged

Fix ResourceManagerStringLocalizerFactory caching #33129

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d67109e
Fix ResourceManagerStringLocalizerFactory caching
sebastienros May 29, 2021
03564d5
Doh!
sebastienros May 29, 2021
e4a5d54
Update src/Localization/Localization/src/ResourceManagerStringLocaliz…
sebastienros May 29, 2021
a318a56
Update src/Localization/Localization/src/ResourceManagerStringLocaliz…
sebastienros May 29, 2021
cf25024
Merge branch 'main' into sebros/localizercache
sebastienros Oct 11, 2021
d6b8863
Merge branch 'main' into sebros/localizercache
sebastienros Feb 24, 2022
4a60a68
Update src/Localization/Localization/src/ResourceManagerStringLocaliz…
pranavkm Feb 25, 2022
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
17 changes: 12 additions & 5 deletions src/Localization/Localization/src/ResourceManagerStringLocalizerFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected virtual string GetResourcePrefix(TypeInfo typeInfo, string? baseNamesp
{
return typeInfo.FullName;
}

else
{
// This expectation is defined by dotnet's automatic resource storage.
Expand Down Expand Up @@ -153,13 +154,19 @@ public IStringLocalizer Create(Type resourceSource)
throw new ArgumentNullException(nameof(resourceSource));
}

var typeInfo = resourceSource.GetTypeInfo();

var baseName = GetResourcePrefix(typeInfo);
// Get without Add to prevent unnecessary lambda allocation
if (!_localizerCache.TryGetValue(resourceSource.AssemblyQualifiedName!, out var localizer))
{
var typeInfo = resourceSource.GetTypeInfo();
var baseName = GetResourcePrefix(typeInfo);
var assembly = typeInfo.Assembly;

var assembly = typeInfo.Assembly;
localizer = CreateResourceManagerStringLocalizer(assembly, baseName);

_localizerCache[resourceSource.AssemblyQualifiedName!] = localizer;
}

return _localizerCache.GetOrAdd(baseName, _ => CreateResourceManagerStringLocalizer(assembly, baseName));
return localizer;
}

/// <summary>
Expand Down