Merge pull request #3139 from peppy/fix-resourcestore-null-handling

Ensure ResourceStore returns null rather than exception on null request
ppy · Dec 25, 2019 · 8a960c3 · 8a960c3
2 parents d3612b4 + 8c1a421
commit 8a960c3
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/osu.Framework/IO/Stores/ResourceStore.cs b/osu.Framework/IO/Stores/ResourceStore.cs
@@ -84,6 +84,9 @@ public virtual void RemoveStore(IResourceStore<T> store)
         /// <returns>The object.</returns>
         public virtual async Task<T> GetAsync(string name)
         {
+            if (name == null)
+                return null;
+
             var filenames = GetFilenames(name);
 
             // required for locking
@@ -113,6 +116,9 @@ public virtual async Task<T> GetAsync(string name)
         /// <returns>The object.</returns>
         public virtual T Get(string name)
         {
+            if (name == null)
+                return null;
+
             var filenames = GetFilenames(name);
 
             // Cache miss - get the resource
@@ -134,6 +140,9 @@ public virtual T Get(string name)
 
         public Stream GetStream(string name)
         {
+            if (name == null)
+                return null;
+
             var filenames = GetFilenames(name);
 
             // Cache miss - get the resource