Merge pull request #78 from NLog/check-for-null-session

added null checks
NLog · Dec 24, 2016 · a6f0498 · a6f0498
2 parents abf7e1b + 900686c
commit a6f0498
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/NLog.Web.AspNetCore/Internal/PropertyReader.cs b/NLog.Web.AspNetCore/Internal/PropertyReader.cs
@@ -28,10 +28,18 @@ public static object GetValue(string key, Func<string, object> getVal, bool eval
 
                 value = getVal(path.First());
 
-                foreach (var property in path.Skip(1))
+                if (value != null)
                 {
-                    var propertyInfo = GetPropertyInfo(value, property);
-                    value = propertyInfo?.GetValue(value, null);
+                    foreach (var property in path.Skip(1))
+                    {
+                        var propertyInfo = GetPropertyInfo(value, property);
+                        value = propertyInfo?.GetValue(value, null);
+                        if (value == null)
+                        {
+                            //done
+                            break;
+                        }
+                    }
                 }
             }
             else
@@ -44,9 +52,9 @@ public static object GetValue(string key, Func<string, object> getVal, bool eval
         private static PropertyInfo GetPropertyInfo(object value, string propertyName)
         {
 #if !NETSTANDARD_1plus
-            return value.GetType().GetProperty(propertyName);
+            return value?.GetType().GetProperty(propertyName);
 #else
-            return value.GetType().GetTypeInfo().GetDeclaredProperty(propertyName);
+            return value?.GetType().GetTypeInfo().GetDeclaredProperty(propertyName);
 #endif
         }
     }

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetItemValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetItemValueLayoutRenderer.cs
@@ -68,6 +68,11 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             var context = HttpContextAccessor.HttpContext;
 
+            if (context == null)
+            {
+                return;
+            }
+
             Func<string, object> getVal = k => context.Items[k];
 
             var value = PropertyReader.GetValue(Variable, getVal, EvaluateAsNestedProperties);

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestValueLayoutRenderer.cs
@@ -83,7 +83,7 @@ public class AspNetRequestValueLayoutRenderer : AspNetLayoutRendererBase
         /// <param name="logEvent">Logging event.</param>
         protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
         {
-            var httpRequest = HttpContextAccessor.HttpContext.TryGetRequest();
+            var httpRequest = HttpContextAccessor?.HttpContext?.TryGetRequest();
             if (httpRequest == null)
             {
                 return;

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionIDLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionIDLayoutRenderer.cs
@@ -23,7 +23,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
         {
             var context = HttpContextAccessor.HttpContext;
 
-            if (context.Session == null)
+            if (context?.Session == null)
             {
                 return;
             }

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs
@@ -71,7 +71,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
 
             var context = HttpContextAccessor.HttpContext;
-            if (context.Session == null)
+            if (context?.Session == null)
             {
                 return;
             }
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 var context = HttpContextAccessor.HttpContext;
-                if (context.Session == null)
+                if (context?.Session == null)
                 {
                     return;
                 }
@@ Expand Down @@