Fix for issue EventSource MultiEnable bug (dotnet#14729)

Fixes issue #14728
dotnet-bot · Oct 30, 2017 · 0c8b4af · 0c8b4af
1 parent ffcb012
commit 0c8b4af
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs b/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs
@@ -2679,8 +2679,16 @@ internal void SendCommand(EventListener listener, int perEventSourceSessionId, i
                 else
                 {
                     // We can't do the command, simply remember it and we do it when we are fully constructed.  
-                    commandArgs.nextCommand = m_deferredCommands;
-                    m_deferredCommands = commandArgs;
+                    if (m_deferredCommands == null)
+                        m_deferredCommands = commandArgs;       // create the first entry
+                    else
+                    {
+                        // We have one or more etries, find the last one and add it to that.  
+                        EventCommandEventArgs lastCommand = m_deferredCommands;
+                        while (lastCommand.nextCommand != null)
+                            lastCommand = lastCommand.nextCommand;
+                        lastCommand.nextCommand = commandArgs;
+                    }
                 }
             }
         }
@@ -3190,7 +3198,7 @@ private unsafe bool SendManifest(byte[] rawManifest)
 
             Debug.Assert(!SelfDescribingEvents);
 
-#if FEATURE_MANAGED_ETW
+#if FEATURE_MANAGED_ETW 
             fixed (byte* dataPtr = rawManifest)
             {
                 // we don't want the manifest to show up in the event log channels so we specify as keywords