nopSolutions#4154 Fix caching the state provinces by abbreviation

chan2will · Nov 20, 2019 · d8e2c8f · d8e2c8f
1 parent bacb97e
commit d8e2c8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Libraries/Nop.Services/Directory/NopDirectoryDefaults.cs b/src/Libraries/Nop.Services/Directory/NopDirectoryDefaults.cs
@@ -131,7 +131,7 @@ public static partial class NopDirectoryDefaults
         /// {0} : abbreviation
         /// {1} : country ID
         /// </remarks>
-        public static string StateProvincesByAbbreviationCacheKey => "Nop.stateprovince.abbreviationcountryid-{0}";
+        public static string StateProvincesByAbbreviationCacheKey => "Nop.stateprovince.abbreviationcountryid-{0}-{1}";
 
 
         /// <summary>

diff --git a/src/Libraries/Nop.Services/Directory/StateProvinceService.cs b/src/Libraries/Nop.Services/Directory/StateProvinceService.cs
@@ -80,7 +80,7 @@ public virtual StateProvince GetStateProvinceByAbbreviation(string abbreviation,
             if (string.IsNullOrEmpty(abbreviation))
                 return null;
 
-            var key = string.Format(NopDirectoryDefaults.StateProvincesByAbbreviationCacheKey, abbreviation, countryId.HasValue ? countryId.Value : 0);
+            var key = string.Format(NopDirectoryDefaults.StateProvincesByAbbreviationCacheKey, abbreviation, countryId ?? 0);
             return _cacheManager.Get(key, () =>
             {
                 var query = _stateProvinceRepository.Table.Where(state => state.Abbreviation == abbreviation);