huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
Chris Ross (ASP.NET) 2017-05-03 10:32:35 -07:00
parent a1b729184c d74040786c
commit dcbd39c1fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
View File

@ -301,7 +301,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
// If by this point, the host process is still running (somehow), throw an error. // If by this point, the host process is still running (somehow), throw an error.
// A test failure is better than a silent hang and unknown failure later on // A test failure is better than a silent hang and unknown failure later on
if (!_hostProcess.HasExited) if (_hostProcess != null && !_hostProcess.HasExited)
{ {
throw new Exception($"iisexpress Process {_hostProcess.Id} failed to shutdown"); throw new Exception($"iisexpress Process {_hostProcess.Id} failed to shutdown");
} }