From 37a445715085d942f3b96816c8464fbd58219e18 Mon Sep 17 00:00:00 2001
From: Huei Feng <34702552+hueifeng@users.noreply.github.com>
Date: Wed, 8 Jul 2020 16:58:39 +0800
Subject: [PATCH] Update `StaticWebAssetsFileProvider NormalizePath` (#22418)
Skips an unnecessary null check.
---
.../StaticWebAssets/StaticWebAssetsFileProvider.cs | 2 +-
.../StaticWebAssetsFileProviderTests.cs | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs b/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs
index 5a9b578e988..8e2b9a5c082 100644
--- a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs
+++ b/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs
@@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets
private static string NormalizePath(string path)
{
path = path.Replace('\\', '/');
- return path != null && path.StartsWith("/") ? path : "/" + path;
+ return path.StartsWith("/") ? path : "/" + path;
}
private bool StartsWithBasePath(string subpath, out PathString rest)
diff --git a/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs b/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs
index dba63c43f3c..1fae0b3daa5 100644
--- a/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs
+++ b/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs
@@ -87,6 +87,20 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets
// Assert
Assert.Empty(directory);
}
+
+ [Fact]
+ public void GetDirectoryContents_HandlersEmptyPath()
+ {
+ // Arrange
+ var provider = new StaticWebAssetsFileProvider("/_content",
+ Path.Combine(AppContext.BaseDirectory, "testroot", "wwwroot"));
+
+ // Act
+ var directory = provider.GetDirectoryContents("");
+
+ // Assert
+ Assert.True(directory.Exists);
+ }
[Fact]
public void GetDirectoryContents_HandlesWhitespaceInBase()
--
GitLab