Merge pull request CommunityToolkit#3105 from SoundersFan/FileCacheNu…

…llReference FileCache throws NullReferenceException
skendrot · Jan 29, 2020 · ba1c642 · ba1c642
2 parents 5b8f90e + 4a94c7a
commit ba1c642
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs b/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
@@ -34,7 +34,7 @@ public class FileCache : CacheBase<StorageFile>
         protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
             // nothing to do in this instance;
-            return null;
+            return Task.FromResult<StorageFile>(null);
         }
 
         /// <summary>
@@ -45,7 +45,7 @@ protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<Key
         /// <returns>awaitable task</returns>
         protected override Task<StorageFile> InitializeTypeAsync(StorageFile baseFile, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
-            return Task.Run(() => baseFile);
+            return Task.FromResult(baseFile);
         }
     }
 }