diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
index 8000e365c3..b2303cb6b6 100644
--- a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
+++ b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
@@ -17,7 +17,6 @@
-
diff --git a/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
index 93921b1cb2..c14db98721 100644
--- a/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Localization.Routing
if (culture == null && uiCulture == null)
{
// No values specified for either so no match
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
if (culture != null && uiCulture == null)
diff --git a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
index 7162ef52a9..ecde6636f7 100644
--- a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Localization
if (acceptLanguageHeader == null || acceptLanguageHeader.Count == 0)
{
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
var languages = acceptLanguageHeader.AsEnumerable();
@@ -49,12 +49,12 @@ namespace Microsoft.AspNetCore.Localization
var orderedLanguages = languages.OrderByDescending(h => h, StringWithQualityHeaderValueComparer.QualityComparer)
.Select(x => x.Value).ToList();
- if (orderedLanguages.Any())
+ if (orderedLanguages.Count > 0)
{
return Task.FromResult(new ProviderCultureResult(orderedLanguages));
}
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
}
}
diff --git a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
index b1c389225b..59a2891dbb 100644
--- a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Localization
if (string.IsNullOrEmpty(cookie))
{
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
var providerResultCulture = ParseCookieValue(cookie);
diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
index da0b250919..c7a5e230a4 100644
--- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
+++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
@@ -18,7 +18,6 @@
-
diff --git a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
index a39756c9b7..1f01c0d8c5 100644
--- a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization
var request = httpContext.Request;
if (!request.QueryString.HasValue)
{
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
string queryCulture = null;
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Localization
if (queryCulture == null && queryUICulture == null)
{
// No values specified for either so no match
- return TaskCache.DefaultCompletedTask;
+ return NullProviderCultureResult;
}
if (queryCulture != null && queryUICulture == null)
diff --git a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
index c3103596e2..9430cbdd0a 100644
--- a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
@@ -12,6 +12,12 @@ namespace Microsoft.AspNetCore.Localization
///
public abstract class RequestCultureProvider : IRequestCultureProvider
{
+ ///
+ /// Result that indicates that this instance of could not determine the
+ /// request culture.
+ ///
+ protected static readonly Task NullProviderCultureResult = Task.FromResult(default(ProviderCultureResult));
+
///
/// The current options for the .
///