nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression in LoadCacheable

Browse source 
- Issue MatterHackers/MCCentral#3473
Investigate failing LoadPublicProfileListFromCache
/ LoadProfileFromStaticData tests
This commit is contained in:
John Lewin 2018-05-30 13:40:23 -07:00
parent 5d522a2de7
commit 51c76690d8
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ApplicationView/ApplicationController.cs
View file

@ -1124,7 +1124,8 @@ namespace MatterHackers.MatterControl
}
}
public string LoadCachedFile(string cacheKey, string cacheScope)
public static string LoadCachedFile(string cacheKey, string cacheScope)
{
string cachePath = CacheablePath(cacheScope, cacheKey);
@ -1139,7 +1140,12 @@ namespace MatterHackers.MatterControl
public static Task<T> LoadCacheableAsync<T>(string cacheKey, string cacheScope, string staticDataFallbackPath = null) where T : class
{
string cachePath = CacheablePath(cacheScope, cacheKey);
if (LoadCachedFile(cacheKey, cacheScope) is string cachedFile)
{
// Load from cache and deserialize
return Task.FromResult(
JsonConvert.DeserializeObject<T>(cachedFile));
}
try
{