lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing that FileSystemStorageProvider.ListProfiles changes can cause NRE in DeleteFile and cause test failure

Browse Source 
in CreateFileAndDeleteFileTakesAnySlash if the "_Profiles" folder doesn't exist
This commit is contained in:
Lombiq
2019-02-20 16:18:37 +01:00
parent 992e79de36
commit dd787a1d10
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
View File

@@ -245,7 +245,6 @@ namespace Orchard.FileSystems.Media {
/// <param name="path">The relative path to the file to be deleted.</param>
/// <exception cref="ArgumentException">If the file doesn't exist.</exception>
public void DeleteFile(string path) {
FileInfo fileInfo = new FileInfo(MapStorage(path));
if (!fileInfo.Exists) {
throw new ArgumentException(T("File {0} does not exist", path).ToString());
@@ -253,7 +252,7 @@ namespace Orchard.FileSystems.Media {
fileInfo.Delete();
lock (String.Intern(path)) {
lock (string.Intern(path)) {
var ListProfileFileInfo = ListProfiles(path);
foreach (var profileFileInfo in ListProfileFileInfo) {
if (profileFileInfo.Exists) {
@@ -277,11 +276,12 @@ namespace Orchard.FileSystems.Media {
var fileLocation = urlpath.Substring(0, urlpath.Length - filenameWithExtension.Length);
var hashpath = fileLocation.GetHashCode().ToString("x").ToLowerInvariant();
DirectoryInfo directoryInfo = new DirectoryInfo(MapStorage("_Profiles"));
if (!directoryInfo.Exists) {
return null;
}
var fileinfos = directoryInfo.GetFiles(filenameWithExtension, SearchOption.AllDirectories);
return fileinfos.Where(x => x.Directory.Name.Equals(hashpath));
return directoryInfo.Exists ?
directoryInfo
.GetFiles(filenameWithExtension, SearchOption.AllDirectories)
.Where(x => x.Directory.Name.Equals(hashpath)) :
Enumerable.Empty<FileInfo>();
}
/// <summary>