fix: prevent setting unsupported messageid header

Zywave · Jul 28, 2016 · 11aefe9 · 11aefe9
1 parent bbafd74
commit 11aefe9
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/SMLogging/RequestLoggingMessageInspector.cs b/SMLogging/RequestLoggingMessageInspector.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
@@ -178,9 +180,19 @@ public object BeforeSendRequest(ref Message request, IClientChannel channel)
 
             if (request != null)
             {
-                if (AddMessageIdRequestHeader && request.Headers.MessageId == null)
+                if (AddMessageIdRequestHeader && request.Headers.MessageId == null && request.Version.Addressing != AddressingVersion.None)
                 {
-                    request.Headers.MessageId = new UniqueId(Guid.NewGuid());
+                    try
+                    {
+                        request.Headers.MessageId = new UniqueId(Guid.NewGuid());
+                    }
+                    catch
+                    {
+                        if (Debugger.IsAttached)
+                        {
+                            throw;
+                        }
+                    }
                 }
 
                 data.MessageId = GetMessageId(request.Headers.MessageId);