Merge pull request #334 from erwinwolff/master

Fixes empty "properties" collection.
NLog · May 1, 2014 · 545029e · 545029e
2 parents d21cc1f + acb1636
commit 545029e
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/NLog/Targets/Target.cs b/src/NLog/Targets/Target.cs
@@ -434,7 +434,9 @@ protected virtual void Write(LogEventInfo logEvent)
         protected virtual void Write(AsyncLogEventInfo logEvent)
         {
             try
-            {
+            {
+                this.MergeEventProperties(logEvent.LogEvent);
+
                 this.Write(logEvent.LogEvent);
                 logEvent.Continuation(null);
             }
@@ -472,6 +474,22 @@ private void GetAllLayouts()
         {
             this.allLayouts = new List<Layout>(ObjectGraphScanner.FindReachableObjects<Layout>(this));
             InternalLogger.Trace("{0} has {1} layouts", this, this.allLayouts.Count);
+        }
+
+        private void MergeEventProperties(LogEventInfo logEvent)
+        {
+            foreach (var item in logEvent.Parameters)
+            {
+                if (item.GetType() == typeof(LogEventInfo))
+                {
+
+                    foreach (var propertyItem in ((LogEventInfo)item).Properties)
+                    {
+                        logEvent.Properties.Remove(propertyItem.Key);
+                        logEvent.Properties.Add(propertyItem);
+                    }
+                }
+            }
         }
     }
 }