Merge pull request #6299 from hannan-azam/6292

Check for Nullability of HttpContext while getting Client IP
This commit is contained in:
Sébastien Ros 2016-01-28 12:16:55 -08:00
commit c21411041f

View File

@ -24,7 +24,12 @@ namespace Orchard.Services {
public string ClientHostAddressHeaderName { get; set; }
public string GetClientAddress() {
var request = _wca.GetContext().HttpContext.Request;
var workContext = _wca.GetContext();
if (workContext == null || workContext.HttpContext == null)
return string.Empty;
var request = workContext.HttpContext.Request;
if (EnableClientHostAddressHeader && !String.IsNullOrWhiteSpace(ClientHostAddressHeaderName)) {
var headerName = ClientHostAddressHeaderName.Trim();