Merge pull request #6469 from Urtgard/dev

Added null check for remoteIpAdress in HttpContextClientInfoProvider.GetComputerName
aspnetboilerplate · Jun 10, 2022 · 098e71c · 098e71c
2 parents 55e85ea + 4adcbee
commit 098e71c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Abp.AspNetCore/AspNetCore/Mvc/Auditing/HttpContextClientInfoProvider.cs b/src/Abp.AspNetCore/AspNetCore/Mvc/Auditing/HttpContextClientInfoProvider.cs
@@ -1,8 +1,7 @@
-using System;
-using Abp.Auditing;
+using Abp.Auditing;
 using Castle.Core.Logging;
 using Microsoft.AspNetCore.Http;
-using Abp.Extensions;
+using System;
 using System.Net;
 
 namespace Abp.AspNetCore.Mvc.Auditing
@@ -56,8 +55,11 @@ protected virtual string GetComputerName()
             try
             {
                 var httpContext = _httpContextAccessor.HttpContext;
-                return Dns.GetHostEntry(httpContext?.Connection?.RemoteIpAddress).HostName;
+                var remoteIpAddress = httpContext?.Connection?.RemoteIpAddress;
 
+                if (remoteIpAddress is null) return null;
+
+                return Dns.GetHostEntry(remoteIpAddress).HostName;
             }
             catch (Exception ex)
             {