Browse Source

Merge branch 'kennyburns1967-V1' into V1

Former-commit-id: 44d7a81d3270bc8eef99d3698885d6585248eded
af/merge-core
James South 12 years ago
parent
commit
0d156916fe
  1. 18
      src/ImageProcessor.Web/NET45/Caching/DiskCache.cs

18
src/ImageProcessor.Web/NET45/Caching/DiskCache.cs

@ -229,7 +229,7 @@ namespace ImageProcessor.Web.Caching
DirectoryInfo parentDirectoryInfo = directoryInfo.Parent;
// ReSharper disable once PossibleNullReferenceException
foreach (DirectoryInfo enumerateDirectory in parentDirectoryInfo.EnumerateDirectories())
foreach (DirectoryInfo enumerateDirectory in SafeEnumerateDirectories(parentDirectoryInfo))
{
IEnumerable<FileInfo> files = enumerateDirectory.EnumerateFiles().OrderBy(f => f.CreationTimeUtc);
int count = files.Count();
@ -260,6 +260,22 @@ namespace ImageProcessor.Web.Caching
}
}
public static IEnumerable<DirectoryInfo> SafeEnumerateDirectories(DirectoryInfo directoryInfo)
{
IEnumerable<DirectoryInfo> directories;
try
{
directories = directoryInfo.EnumerateDirectories();
}
catch
{
return Enumerable.Empty<DirectoryInfo>();
}
return directories;
}
/// <summary>
/// Gets the full transformed cached path for the image.
/// The images are stored in paths that are based upon the sha1 of their full request path

Loading…
Cancel
Save