yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10686 from deMD/bugfix/applicationbuilder_nullcheck_order

Browse Source 
Moved nullcheck to top to catch possible nullreference exceptions
This commit is contained in:
Shannon Deminick
2021-07-16 01:14:52 +10:00
committed by GitHub
parent a5ee8566b8 62352fc1a6
commit e6a27a09dc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
View File

@@ -27,10 +27,6 @@ namespace Umbraco.Extensions
/// </summary>
public static IUmbracoApplicationBuilder UseUmbraco(this IApplicationBuilder app)
{
IOptions<UmbracoPipelineOptions> startupOptions = app.ApplicationServices.GetRequiredService<IOptions<UmbracoPipelineOptions>>();
app.RunPrePipeline(startupOptions.Value);
// TODO: Should we do some checks like this to verify that the corresponding "Add" methods have been called for the
// corresponding "Use" methods?
// https://github.com/dotnet/aspnetcore/blob/b795ac3546eb3e2f47a01a64feb3020794ca33bb/src/Mvc/Mvc.Core/src/Builder/MvcApplicationBuilderExtensions.cs#L132
@@ -39,6 +35,9 @@ namespace Umbraco.Extensions
throw new ArgumentNullException(nameof(app));
}
IOptions<UmbracoPipelineOptions> startupOptions = app.ApplicationServices.GetRequiredService<IOptions<UmbracoPipelineOptions>>();
app.RunPrePipeline(startupOptions.Value);
app.UseUmbracoCore();
app.UseUmbracoRequestLogging();