From dbe89d0a8233aaed570662d12eaa0e23c88a8bba Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Fri, 24 Apr 2015 15:06:01 -0700 Subject: [PATCH] avoid null exception in AzureBlobStorageProvider.GetStoragePath, fixes #4402 --- .../Orchard.Azure/Services/FileSystems/AzureFileSystem.cs | 2 +- .../Services/FileSystems/Media/AzureBlobStorageProvider.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs index 2ff22df9c..6b76efedc 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs @@ -63,7 +63,7 @@ namespace Orchard.Azure.Services.FileSystems { _publicHostName = publicHostName; } - private void EnsureInitialized() { + protected void EnsureInitialized() { if (_storageAccount != null) { return; } diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs index 3ff1fb2f6..2e38b1cfa 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs @@ -60,6 +60,7 @@ namespace Orchard.Azure.Services.FileSystems.Media { /// The public URL of the media. /// The corresponding local path. public string GetStoragePath(string url) { + EnsureInitialized(); if (url.StartsWith(_absoluteRoot)) { return HttpUtility.UrlDecode(url.Substring(Combine(_absoluteRoot, "/").Length)); }