From f8191a0e4a95fced642d0182f039f0bf1c13b9a1 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Fri, 4 Oct 2019 15:08:22 +0200 Subject: [PATCH] Throw exception when no UmbracoContext exists --- .../Umbraco/PublishedModelUtility.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs b/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs index 18f04cf8..cb708e92 100644 --- a/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs +++ b/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs @@ -26,15 +26,18 @@ public static class PublishedModelUtility public static IPublishedContentType GetModelContentType(PublishedItemType itemType, string alias) { - var facade = Current.UmbracoContext.PublishedSnapshot; // fixme inject! + var umbracoContext = Current.UmbracoContext; + if (umbracoContext == null) throw new InvalidOperationException("This method requires an UmbracoContext, ensure this is created using IUmbracoContextFactory.EnsureUmbracoContext()."); + + var publishedSnapshot = umbracoContext.PublishedSnapshot; switch (itemType) { case PublishedItemType.Content: - return facade.Content.GetContentType(alias); + return publishedSnapshot.Content.GetContentType(alias); case PublishedItemType.Media: - return facade.Media.GetContentType(alias); + return publishedSnapshot.Media.GetContentType(alias); case PublishedItemType.Member: - return facade.Members.GetContentType(alias); + return publishedSnapshot.Members.GetContentType(alias); default: throw new ArgumentOutOfRangeException(nameof(itemType)); }