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

Fix weird NRE

This commit is contained in:
James Newton-King 2018-04-17 20:58:18 +12:00
parent 8985fee4b5
commit 259dd04c99
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs
View File

@ -814,8 +814,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
try try
{ {
await hubConnection.StartAsync().OrTimeout(); await hubConnection.StartAsync().OrTimeout();
var headerValues = await hubConnection.InvokeAsync<string[]>(nameof(TestHub.GetHeaderValues), new[] { "X-test", "X-42" }).OrTimeout(); var headerValues = await hubConnection.InvokeAsync<string[]>(nameof(TestHub.GetHeaderValues), new[] {"X-test", "X-42"}).OrTimeout();
Assert.Equal(new[] { "42", "test" }, headerValues); Assert.Equal(new[] {"42", "test"}, headerValues);
} }
catch (Exception ex) catch (Exception ex)
{ {

12
test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs
View File

@ -30,9 +30,17 @@ namespace Microsoft.AspNetCore.SignalR.Tests
private void ServerFixtureOnServerLogged(LogRecord logRecord) private void ServerFixtureOnServerLogged(LogRecord logRecord)
{ {
var write = logRecord.Write;
if (write == null)
{
_scopeLogger.LogWarning("Server log has no data.");
return;
}
// Create (or get) a logger with the same name as the server logger // Create (or get) a logger with the same name as the server logger
var logger = _serverLoggers.GetOrAdd(logRecord.Write.LoggerName, loggerName => _loggerFactory.CreateLogger(loggerName)); var logger = _serverLoggers.GetOrAdd(write.LoggerName, loggerName => _loggerFactory.CreateLogger(loggerName));
logger.Log(logRecord.Write.LogLevel, logRecord.Write.EventId, logRecord.Write.State, logRecord.Write.Exception, logRecord.Write.Formatter); logger.Log(write.LogLevel, write.EventId, write.State, write.Exception, write.Formatter);
} }
public void Dispose() public void Dispose()