Fix NullReferenceException in Orphan() codepath (#3908 from Azure/cgillum-patch-1)

cgillum · web-flow · commit 75937b546c06 · 2019-01-15T16:32:21.000-08:00
diff --git a/src/WebJobs.Script.WebHost/WebJobsScriptHostService.cs b/src/WebJobs.Script.WebHost/WebJobsScriptHostService.cs
@@ -368,7 +368,7 @@ private bool ShutdownHostIfUnhealthy()
         /// <param name="instance">The <see cref="IHost"/> instance to remove</param>
         private async Task Orphan(IHost instance, ILogger logger, CancellationToken cancellationToken = default)
         {
-            var scriptHost = (ScriptHost)instance.Services.GetService<ScriptHost>();
+            var scriptHost = (ScriptHost)instance?.Services.GetService<ScriptHost>();
             if (scriptHost != null)
             {
                 scriptHost.HostInitializing -= OnHostInitializing;

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ private bool ShutdownHostIfUnhealthy()`
`368`	`368`	`/// <param name="instance">The <see cref="IHost"/> instance to remove</param>`
`369`	`369`	`private async Task Orphan(IHost instance, ILogger logger, CancellationToken cancellationToken = default)`
`370`	`370`	`{`
`371`		`- var scriptHost = (ScriptHost)instance.Services.GetService<ScriptHost>();`
	`371`	`+ var scriptHost = (ScriptHost)instance?.Services.GetService<ScriptHost>();`
`372`	`372`	`if (scriptHost != null)`
`373`	`373`	`{`
`374`	`374`	`scriptHost.HostInitializing -= OnHostInitializing;`