yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-11570 - performed instantiation locally in classes where WebClient or HttpClient is used only in 1 method and added null check

Browse Source
This commit is contained in:
RaduOrleanu
2018-08-29 12:39:06 +02:00
parent 07e5161988
commit 412069414b
5 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/Scheduling/ScheduledTasks.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Scheduling
internal class ScheduledTasks : RecurringTaskBase
{
private static readonly HttpClient HttpClient = new HttpClient();
private static HttpClient _httpClient;
private readonly ApplicationContext _appContext;
private readonly IUmbracoSettingsSection _settings;
private static readonly Hashtable ScheduledTaskTimes = new Hashtable();
@@ -62,9 +62,13 @@ namespace Umbraco.Web.Scheduling
private async Task<bool> GetTaskByHttpAync(string url, CancellationToken token)
{
if (_httpClient == null)
{
_httpClient = new HttpClient();
}
if (Uri.TryCreate(_appContext.UmbracoApplicationUrl, UriKind.Absolute, out var baseUri))
{
HttpClient.BaseAddress = baseUri;
_httpClient.BaseAddress = baseUri;
}
var request = new HttpRequestMessage(HttpMethod.Get, url);
@@ -73,7 +77,7 @@ namespace Umbraco.Web.Scheduling
try
{
var result = await HttpClient.SendAsync(request, token).ConfigureAwait(false); // ConfigureAwait(false) is recommended? http://blog.stephencleary.com/2012/07/dont-block-on-async-code.html
var result = await _httpClient.SendAsync(request, token).ConfigureAwait(false); // ConfigureAwait(false) is recommended? http://blog.stephencleary.com/2012/07/dont-block-on-async-code.html
return result.StatusCode == HttpStatusCode.OK;
}
catch (Exception ex)