Merge pull request #6 from sboukhalfa/master

Prevent throwing an exception if the service is called outside of an OperationContext

Author: hadason

MiniProfiler.WCF.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>MiniProfiler.WCF</id>
-    <version>3.0.12.1-wcffix-005</version>
+    <version>3.0.12.1-wcffix-006</version>
     <authors>Marc Gravell, Sam Saffron, Jarrod Dixon</authors>
     <owners>Marc Gravell, Sam Saffron, Jarrod Dixon</owners>
     <description>MiniProfiler integration for WCF</description>

StackExchange.Profiling.Wcf/Helpers/WcfOperationContextExtension.cs

@@ -19,7 +19,7 @@ public static WcfOperationContextExtension Current
                 var context = OperationContext.Current;
                 if (null == context)
                 {
-                    throw new InvalidOperationException("An attempt was made to access a WCF operation context extension outside of WCF context.");
+                    return null;
                 }
 
                 var extension = context.Extensions.Find<WcfOperationContextExtension>();

StackExchange.Profiling.Wcf/Properties/AssemblyInfo.cs

@@ -12,4 +12,4 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("a95b0bf2-e9cf-4029-b77a-85b9e66fd3d5")]
 [assembly: AssemblyVersion("3.0.12.1")]
-[assembly: AssemblyInformationalVersion("3.0.12.1-wcffix-004")]
+[assembly: AssemblyInformationalVersion("3.0.12.1-wcffix-006")]

StackExchange.Profiling.Wcf/WcfRequestProfilerProvider.cs

@@ -143,7 +143,7 @@ public override void Stop(bool discardResults)
         /// <returns>the mini profiler.</returns>
         public override MiniProfiler GetCurrentProfiler()
         {
-            return WcfOperationContextExtension.Current.Items[WCF_CACHE_KEY] as MiniProfiler;
+            return WcfOperationContextExtension.Current?.Items[WCF_CACHE_KEY] as MiniProfiler;
         }
 
         /// <summary>
@@ -189,7 +189,12 @@ private static void EnsureServiceName(MiniProfiler profiler/*, HttpRequest reque
         /// <param name="profiler">The profiler.</param>
         private void SetCurrentProfiler(MiniProfiler profiler)
         {
-            WcfOperationContextExtension.Current.Items[WCF_CACHE_KEY] = profiler;
+            var contextExtension = WcfOperationContextExtension.Current;
+            if (contextExtension == null)
+            {
+                return;
+            }
+            contextExtension.Items[WCF_CACHE_KEY] = profiler;
         }
     }
 }