Merge branch 'dev' into reformat

This commit is contained in:
Erwin de Haan
2019-01-18 17:04:01 +01:00
13 changed files with 137 additions and 152 deletions

View File

@@ -387,7 +387,7 @@ namespace Emby.Server.Implementations.HttpClientManager
{
options.ResourcePool?.Release();
throw new HttpException(string.Format("Connection to {0} timed out", options.Url)) { IsTimedOut = true };
throw new HttpException($"Connection to {options.Url} timed out") { IsTimedOut = true };
}
if (options.LogRequest)