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

Merged release/2.1

This commit is contained in:
David Fowler 2018-04-04 14:48:26 -07:00
parent 313772ef03 5e190b404f
commit cf45fac634
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.cs
View File

@ -381,6 +381,8 @@ namespace Microsoft.AspNetCore.Http.Connections
// Establish the connection // Establish the connection
var connection = _manager.CreateConnection(); var connection = _manager.CreateConnection();
EnsureConnectionStateInternal(connection, options);
// Set the Connection ID on the logging scope so that logs from now on will have the // Set the Connection ID on the logging scope so that logs from now on will have the
// Connection ID metadata set. // Connection ID metadata set.
logScope.ConnectionId = connection.ConnectionId; logScope.ConnectionId = connection.ConnectionId;
@ -602,8 +604,6 @@ namespace Microsoft.AspNetCore.Http.Connections
return null; return null;
} }
EnsureConnectionStateInternal(connection, options);
return connection; return connection;
} }
@ -630,6 +630,7 @@ namespace Microsoft.AspNetCore.Http.Connections
if (StringValues.IsNullOrEmpty(connectionId)) if (StringValues.IsNullOrEmpty(connectionId))
{ {
connection = _manager.CreateConnection(); connection = _manager.CreateConnection();
EnsureConnectionStateInternal(connection, options);
} }
else if (!_manager.TryGetConnection(connectionId, out connection)) else if (!_manager.TryGetConnection(connectionId, out connection))
{ {
@ -639,8 +640,6 @@ namespace Microsoft.AspNetCore.Http.Connections
return null; return null;
} }
EnsureConnectionStateInternal(connection, options);
return connection; return connection;
} }