Fixed a null reference exception that could occur if the configuration was locked.

niemyjski · niemyjski · commit 90059f070284 · 2015-03-03T21:25:08.000-06:00
diff --git a/Source/Platforms/Console/ExceptionlessConsoleExtensions.cs b/Source/Platforms/Console/ExceptionlessConsoleExtensions.cs
@@ -35,7 +35,7 @@ private static void RegisterOnProcessExitHandler(this ExceptionlessClient client
                 AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;
                 AppDomain.CurrentDomain.ProcessExit += _onProcessExit;
             } catch (Exception ex) {
-                client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the process exit event.");
+                client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessConsoleExtensions), ex, "An error occurred while wiring up to the process exit event.");
             }
         }
 
diff --git a/Source/Platforms/Windows/ExceptionlessClientExtensions.cs b/Source/Platforms/Windows/ExceptionlessClientExtensions.cs
@@ -25,11 +25,6 @@ public static void RegisterApplicationThreadExceptionHandler(this ExceptionlessC
             } catch (Exception ex) {
                 client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the unobserved task exception event.");
             }
-
-            // make sure that queued events are sent when the app exits
-            AppDomain.CurrentDomain.ProcessExit += (sender, args) => {
-                client.ProcessQueue();
-            };
         }
 
         public static void UnregisterApplicationThreadExceptionHandler(this ExceptionlessClient client) {
diff --git a/Source/Platforms/Windows/ExceptionlessWindowsExtensions.cs b/Source/Platforms/Windows/ExceptionlessWindowsExtensions.cs
@@ -9,15 +9,21 @@
 
 using System;
 using System.Windows.Forms;
+using Exceptionless.Dependency;
 using Exceptionless.Dialogs;
+using Exceptionless.Logging;
 using Exceptionless.Windows.Extensions;
 
 namespace Exceptionless {
     public static class ExceptionlessWindowsExtensions {
+        private static EventHandler _onProcessExit;
         public static void Register(this ExceptionlessClient client, bool showDialog = true) {
             client.Startup();
             client.RegisterApplicationThreadExceptionHandler();
 
+            // make sure that queued events are sent when the app exits
+            client.RegisterOnProcessExitHandler();
+
             if (!showDialog)
                 return;
 
@@ -28,6 +34,7 @@ public static void Register(this ExceptionlessClient client, bool showDialog = t
         public static void Unregister(this ExceptionlessClient client) {
             client.Shutdown();
             client.UnregisterApplicationThreadExceptionHandler();
+            client.UnregisterOnProcessExitHandler();
             
             client.SubmittingEvent -= OnSubmittingEvent;
         }
@@ -41,5 +48,25 @@ private static void OnSubmittingEvent(object sender, EventSubmittingEventArgs e)
             var dialog = new CrashReportForm(e.Client, e.Event);
             e.Cancel = dialog.ShowDialog() != DialogResult.OK;
         }
+
+        private static void RegisterOnProcessExitHandler(this ExceptionlessClient client) {
+            if (_onProcessExit == null)
+                _onProcessExit = (sender, args) => client.ProcessQueue();
+
+            try {
+                AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;
+                AppDomain.CurrentDomain.ProcessExit += _onProcessExit;
+            } catch (Exception ex) {
+                client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessWindowsExtensions), ex, "An error occurred while wiring up to the process exit event.");
+            }
+        }
+
+        private static void UnregisterOnProcessExitHandler(this ExceptionlessClient client) {
+            if (_onProcessExit == null)
+                return;
+
+            AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;
+            _onProcessExit = null;
+        }
     }
 }
diff --git a/Source/Platforms/Wpf/ExceptionlessClientExtensions.cs b/Source/Platforms/Wpf/ExceptionlessClientExtensions.cs
@@ -25,11 +25,6 @@ public static void RegisterApplicationThreadExceptionHandler(this ExceptionlessC
             } catch (Exception ex) {
                 client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the unobserved task exception event.");
             }
-
-            // make sure that queued events are sent when the app exits
-            AppDomain.CurrentDomain.ProcessExit += (sender, args) => {
-                client.ProcessQueue();
-            };
         }
 
         public static void UnregisterApplicationThreadExceptionHandler(this ExceptionlessClient client) {
diff --git a/Source/Platforms/Wpf/ExceptionlessWpfExtensions.cs b/Source/Platforms/Wpf/ExceptionlessWpfExtensions.cs
@@ -10,16 +10,23 @@
 using System;
 using System.Windows;
 using System.Windows.Threading;
+using Exceptionless.Dependency;
 using Exceptionless.Dialogs;
+using Exceptionless.Logging;
 using Exceptionless.Wpf.Extensions;
 
 namespace Exceptionless {
     public static class ExceptionlessWpfExtensions {
+        private static EventHandler _onProcessExit;
+
         public static void Register(this ExceptionlessClient client, bool showDialog = true) {
             client.Startup();
             client.RegisterApplicationThreadExceptionHandler();
             client.RegisterApplicationDispatcherUnhandledExceptionHandler();
 
+            // make sure that queued events are sent when the app exits
+            client.RegisterOnProcessExitHandler();
+
             if (!showDialog)
                 return;
 
@@ -31,6 +38,7 @@ public static void Unregister(this ExceptionlessClient client) {
             client.Shutdown();
             client.UnregisterApplicationThreadExceptionHandler();
             client.UnregisterApplicationDispatcherUnhandledExceptionHandler();
+            client.UnregisterOnProcessExitHandler();
 
             client.SubmittingEvent -= OnSubmittingEvent;
         }
@@ -45,11 +53,31 @@ private static void OnSubmittingEvent(object sender, EventSubmittingEventArgs e)
             else
                 e.Cancel = !ShowDialog(e);
         }
-        
+
         private static bool ShowDialog(EventSubmittingEventArgs e) {
             var dialog = new CrashReportDialog(e.Client, e.Event);
             bool? result = dialog.ShowDialog();
             return result.HasValue && result.Value;
         }
+
+        private static void RegisterOnProcessExitHandler(this ExceptionlessClient client) {
+            if (_onProcessExit == null)
+                _onProcessExit = (sender, args) => client.ProcessQueue();
+
+            try {
+                AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;
+                AppDomain.CurrentDomain.ProcessExit += _onProcessExit;
+            } catch (Exception ex) {
+                client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessWpfExtensions), ex, "An error occurred while wiring up to the process exit event.");
+            }
+        }
+
+        private static void UnregisterOnProcessExitHandler(this ExceptionlessClient client) {
+            if (_onProcessExit == null)
+                return;
+
+            AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;
+            _onProcessExit = null;
+        }
     }
 }
diff --git a/Source/Shared/Configuration/ExceptionlessConfiguration.cs b/Source/Shared/Configuration/ExceptionlessConfiguration.cs
@@ -52,7 +52,10 @@ internal void LockConfig() {
         public string ServerUrl {
             get { return _serverUrl; }
             set {
-                if (_configLocked && !_serverUrl.Equals(value))
+                if (_serverUrl == value)
+                    return;
+
+                if (_configLocked)
                     throw new ArgumentException("ServerUrl can't be changed after the client has been initialized.");
 
                 _serverUrl = value;
@@ -70,7 +73,10 @@ public string ServerUrl {
         public string ApiKey {
             get { return _apiKey; }
             set {
-                if (_configLocked && !_apiKey.Equals(value))
+                if (_apiKey == value)
+                    return;
+
+                if (_configLocked)
                     throw new ArgumentException("ApiKey can't be changed after the client has been initialized.");
 
                 _apiKey = value;

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private static void RegisterOnProcessExitHandler(this ExceptionlessClient client`
`35`	`35`	`AppDomain.CurrentDomain.ProcessExit -= _onProcessExit;`
`36`	`36`	`AppDomain.CurrentDomain.ProcessExit += _onProcessExit;`
`37`	`37`	`} catch (Exception ex) {`
`38`		`- client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the process exit event.");`
	`38`	`+ client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessConsoleExtensions), ex, "An error occurred while wiring up to the process exit event.");`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,6 @@ public static void RegisterApplicationThreadExceptionHandler(this ExceptionlessC`
`25`	`25`	`} catch (Exception ex) {`
`26`	`26`	`client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the unobserved task exception event.");`
`27`	`27`	`}`
`28`		`-`
`29`		`- // make sure that queued events are sent when the app exits`
`30`		`- AppDomain.CurrentDomain.ProcessExit += (sender, args) => {`
`31`		`- client.ProcessQueue();`
`32`		`- };`
`33`	`28`	`}`
`34`	`29`
`35`	`30`	`public static void UnregisterApplicationThreadExceptionHandler(this ExceptionlessClient client) {`