Was made refactoring

Author: Taritsyn

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -846,17 +846,17 @@ private void Dispose(bool disposing)
 					}
 
 					ComHelpers.ReleaseAndEmpty(ref _pActiveScript);
+				});
 
-					if (disposing)
+				if (disposing)
+				{
+					if (_hostItems != null)
 					{
-						if (_hostItems != null)
-						{
-							_hostItems.Clear();
-						}
-
-						_lastException = null;
+						_hostItems.Clear();
 					}
-				});
+
+					_lastException = null;
+				}
 			}
 		}
 

src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs

@@ -1102,22 +1102,23 @@ protected override void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				_dispatcher.Invoke(() =>
+				if (_dispatcher != null)
 				{
-					_jsRuntime.Dispose();
-					base.Dispose(disposing);
+					_dispatcher.Invoke(() => _jsRuntime.Dispose());
+					_dispatcher.Dispose();
+				}
+
+				base.Dispose(disposing);
 #if NETSTANDARD1_3
 
-					if (disposing)
+				if (disposing)
+				{
+					if (_nativeFunctions != null)
 					{
-						if (_nativeFunctions != null)
-						{
-							_nativeFunctions.Clear();
-						}
+						_nativeFunctions.Clear();
 					}
+				}
 #endif
-				});
-				_dispatcher.Dispose();
 			}
 		}
 

src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs

@@ -1140,22 +1140,23 @@ protected override void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				_dispatcher.Invoke(() =>
+				if (_dispatcher != null)
 				{
-					_jsRuntime.Dispose();
-					base.Dispose(disposing);
+					_dispatcher.Invoke(() => _jsRuntime.Dispose());
+					_dispatcher.Dispose();
+				}
+
+				base.Dispose(disposing);
 #if NETSTANDARD1_3
 
-					if (disposing)
+				if (disposing)
+				{
+					if (_nativeFunctions != null)
 					{
-						if (_nativeFunctions != null)
-						{
-							_nativeFunctions.Clear();
-						}
+						_nativeFunctions.Clear();
 					}
+				}
 #endif
-				});
-				_dispatcher.Dispose();
 			}
 		}
 

src/MsieJavaScriptEngine/ScriptDispatcher.cs

@@ -101,6 +101,7 @@ private void StartThread()
 						task = _taskQueue.Dequeue();
 						if (task == null)
 						{
+							_taskQueue.Clear();
 							return;
 						}
 					}
@@ -176,6 +177,11 @@ public T Invoke<T>(Func<T> func)
 		{
 			VerifyNotDisposed();
 
+			if (func == null)
+			{
+				throw new ArgumentNullException("func");
+			}
+
 			return (T)InnnerInvoke(() => func());
 		}
 
@@ -188,6 +194,11 @@ public void Invoke(Action action)
 		{
 			VerifyNotDisposed();
 
+			if (action == null)
+			{
+				throw new ArgumentNullException("action");
+			}
+
 			InnnerInvoke(() =>
 			{
 				action();
@@ -216,25 +227,17 @@ private void Dispose(bool disposing)
 			if (_disposedFlag.Set())
 			{
 				EnqueueTask(null);
-				_thread.Join();
 
-				if (_waitHandle != null)
+				if (_thread != null)
 				{
-					_waitHandle.Dispose();
-					_waitHandle = null;
+					_thread.Join();
+					_thread = null;
 				}
 
-				if (disposing)
+				if (_waitHandle != null)
 				{
-					lock (_taskQueueSynchronizer)
-					{
-						if (_taskQueue != null)
-						{
-							_taskQueue.Clear();
-						}
-					}
-
-					_thread = null;
+					_waitHandle.Dispose();
+					_waitHandle = null;
 				}
 			}
 		}