In JavaScriptEngineSwitcher.ChakraCore changed a implementation of the Dispose method

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>Fixed a error #34 “Finalazier thread is blocked because of JavaScriptEngineSwitcher.ChakraCore.ChakraCoreJsEngine”.</releaseNotes>
+		<releaseNotes>Changed a implementation of the `Dispose` method.</releaseNotes>
 		<copyright>Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,8 +30,7 @@
    =============
    RELEASE NOTES
    =============
-   Fixed a error #34 “Finalazier thread is blocked because of
-   JavaScriptEngineSwitcher.ChakraCore.ChakraCoreJsEngine”.
+   Changed a implementation of the `Dispose` method.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -50,7 +50,7 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// Set of external objects
 		/// </summary>
-		private readonly HashSet<object> _externalObjects = new HashSet<object>();
+		private HashSet<object> _externalObjects = new HashSet<object>();
 
 		/// <summary>
 		/// Callback for finalization of external object
@@ -65,12 +65,12 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// List of native function callbacks
 		/// </summary>
-		private readonly HashSet<JsNativeFunction> _nativeFunctions = new HashSet<JsNativeFunction>();
+		private HashSet<JsNativeFunction> _nativeFunctions = new HashSet<JsNativeFunction>();
 
 		/// <summary>
 		/// Script dispatcher
 		/// </summary>
-		private readonly ScriptDispatcher _dispatcher = new ScriptDispatcher();
+		private ScriptDispatcher _dispatcher;
 
 		/// <summary>
 		/// Unique document name manager
@@ -156,6 +156,7 @@ public ChakraCoreJsEngine(ChakraCoreSettings settings)
 				attributes |= JsRuntimeAttributes.EnableExperimentalFeatures;
 			}
 
+			_dispatcher = new ScriptDispatcher();
 			_externalObjectFinalizeCallback = ExternalObjectFinalizeCallback;
 			_promiseContinuationCallback = PromiseContinuationCallback;
 
@@ -471,15 +472,12 @@ private void ExternalObjectFinalizeCallback(IntPtr data)
 			GCHandle handle = GCHandle.FromIntPtr(data);
 			object obj = handle.Target;
 
-			if (obj == null)
-			{
-				return;
-			}
-
-			if (_externalObjects != null)
+			if (obj != null && _externalObjects != null)
 			{
 				_externalObjects.Remove(obj);
 			}
+
+			handle.Free();
 		}
 
 		private JsValue CreateObjectFromType(Type type)
@@ -1332,33 +1330,45 @@ private void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				if (_dispatcher != null)
+				if (disposing)
 				{
-					_dispatcher.Dispose();
-				}
+					if (_dispatcher != null)
+					{
+						_dispatcher.Invoke(DisposeUnmanagedResources);
 
-				if (_jsContext.IsValid)
-				{
-					_jsContext.Release();
-				}
-				_jsRuntime.Dispose();
+						_dispatcher.Dispose();
+						_dispatcher = null;
+					}
 
-				if (disposing)
-				{
 					if (_externalObjects != null)
 					{
 						_externalObjects.Clear();
+						_externalObjects = null;
 					}
 
 					if (_nativeFunctions != null)
 					{
 						_nativeFunctions.Clear();
+						_nativeFunctions = null;
 					}
 
 					_promiseContinuationCallback = null;
 					_externalObjectFinalizeCallback = null;
 				}
+				else
+				{
+					DisposeUnmanagedResources();
+				}
+			}
+		}
+
+		private void DisposeUnmanagedResources()
+		{
+			if (_jsContext.IsValid)
+			{
+				_jsContext.Release();
 			}
+			_jsRuntime.Dispose();
 		}
 
 		#endregion