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

Merge branch 'release' into dev

This commit is contained in:
Stephen Halter 2016-04-06 14:49:04 -07:00
parent 85fc4f59ef 056b4ac41d
commit 1e36bfac8d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
View File

@ -104,9 +104,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
Post(t => t.OnStopImmediate()); Post(t => t.OnStopImmediate());
if (!_thread.Join(stepTimeout)) if (!_thread.Join(stepTimeout))
{ {
#if NET451 _log.LogError(0, null, "KestrelThread.Stop failed to terminate libuv thread.");
_thread.Abort();
#endif
} }
} }
} }
@ -116,9 +114,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
// Until we rework this logic, ODEs are bound to happen sometimes. // Until we rework this logic, ODEs are bound to happen sometimes.
if (!_thread.Join(stepTimeout)) if (!_thread.Join(stepTimeout))
{ {
#if NET451 _log.LogError(0, null, "KestrelThread.Stop failed to terminate libuv thread.");
_thread.Abort();
#endif
} }
} }
} }