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

narrow lock scope when connections end

This commit is contained in:
Nathan Anderson 2016-05-04 16:50:08 -07:00
parent fed7c44829
commit 132263e767
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
View File

@ -328,20 +328,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
void IConnectionControl.End(ProduceEndType endType) void IConnectionControl.End(ProduceEndType endType)
{ {
lock (_stateLock) switch (endType)
{ {
switch (endType) case ProduceEndType.ConnectionKeepAlive:
{ if (_connectionState != ConnectionState.Open)
case ProduceEndType.ConnectionKeepAlive: {
if (_connectionState != ConnectionState.Open) return;
{ }
return;
}
Log.ConnectionKeepAlive(ConnectionId); Log.ConnectionKeepAlive(ConnectionId);
break; break;
case ProduceEndType.SocketShutdown: case ProduceEndType.SocketShutdown:
case ProduceEndType.SocketDisconnect: case ProduceEndType.SocketDisconnect:
lock (_stateLock)
{
if (_connectionState == ConnectionState.Disconnecting || if (_connectionState == ConnectionState.Disconnecting ||
_connectionState == ConnectionState.SocketClosed) _connectionState == ConnectionState.SocketClosed)
{ {
@ -352,7 +352,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
Log.ConnectionDisconnect(ConnectionId); Log.ConnectionDisconnect(ConnectionId);
_rawSocketOutput.End(endType); _rawSocketOutput.End(endType);
break; break;
} }
} }
} }