Skip to content

FileCache throws NullReferenceException #3105

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 2 commits into from
Jan 29, 2020
Merged

FileCache throws NullReferenceException #3105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc747ed
FileCache.InitializeTypeAsync(Stream...) should not return null. It s…
Jan 22, 2020
4a94c7a
Merge remote-tracking branch 'wct/master' into FileCacheNullReference
Jan 28, 2020
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 Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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);
}
}
}