Improved a implementation of the Dispose method

Author: Taritsyn

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper32.cs

@@ -146,21 +146,30 @@ public override void Dispose()
 		/// managed objects contained in fields of class</param>
 		protected override void Dispose(bool disposing)
 		{
-			if (_disposedFlag.Set())
+			if (disposing)
 			{
-				if (disposing)
+				if (_disposedFlag.Set())
 				{
 					_debugStackFrameSniffer32 = null;
 					_activeScriptDebug32 = null;
 					_activeScriptParse32 = null;
-				}
-
-				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer32);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug32);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse32);
 
-				base.Dispose(disposing);
+					DisposeUnmanagedResources();
+					base.Dispose(true);
+				}
 			}
+			else
+			{
+				DisposeUnmanagedResources();
+				base.Dispose(false);
+			}
+		}
+
+		private void DisposeUnmanagedResources()
+		{
+			ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer32);
+			ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug32);
+			ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse32);
 		}
 
 		#endregion

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper64.cs

@@ -146,21 +146,30 @@ public override void Dispose()
 		/// managed objects contained in fields of class</param>
 		protected override void Dispose(bool disposing)
 		{
-			if (_disposedFlag.Set())
+			if (disposing)
 			{
-				if (disposing)
+				if (_disposedFlag.Set())
 				{
 					_debugStackFrameSniffer64 = null;
 					_activeScriptDebug64 = null;
 					_activeScriptParse64 = null;
-				}
-
-				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer64);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug64);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse64);
 
-				base.Dispose(disposing);
+					DisposeUnmanagedResources();
+					base.Dispose(true);
+				}
 			}
+			else
+			{
+				DisposeUnmanagedResources();
+				base.Dispose(false);
+			}
+		}
+
+		private void DisposeUnmanagedResources()
+		{
+			ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer64);
+			ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug64);
+			ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse64);
 		}
 
 		#endregion

src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs

@@ -776,9 +776,9 @@ public override void Dispose()
 		/// managed objects contained in fields of class</param>
 		private void Dispose(bool disposing)
 		{
-			if (_disposedFlag.Set())
+			if (disposing)
 			{
-				if (disposing)
+				if (_disposedFlag.Set())
 				{
 					if (_dispatcher != null)
 					{
@@ -794,10 +794,10 @@ private void Dispose(bool disposing)
 						_typeMapper = null;
 					}
 				}
-				else
-				{
-					DisposeUnmanagedResources();
-				}
+			}
+			else
+			{
+				DisposeUnmanagedResources();
 			}
 		}
 

src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs

@@ -830,9 +830,9 @@ public override void Dispose()
 		/// managed objects contained in fields of class</param>
 		private void Dispose(bool disposing)
 		{
-			if (_disposedFlag.Set())
+			if (disposing)
 			{
-				if (disposing)
+				if (_disposedFlag.Set())
 				{
 					if (_dispatcher != null)
 					{
@@ -848,10 +848,10 @@ private void Dispose(bool disposing)
 						_typeMapper = null;
 					}
 				}
-				else
-				{
-					DisposeUnmanagedResources();
-				}
+			}
+			else
+			{
+				DisposeUnmanagedResources();
 			}
 		}
 

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -24,7 +24,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
-    <PackageReleaseNotes>Fixed a error “Program crash after function call with too much parameters”.</PackageReleaseNotes>
+    <PackageReleaseNotes>Improved a implementation of the `Dispose` method.</PackageReleaseNotes>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageOutputPath>../../nuget</PackageOutputPath>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

src/MsieJavaScriptEngine/readme.txt

@@ -21,7 +21,7 @@
    =============
    RELEASE NOTES
    =============
-   Fixed a error “Program crash after function call with too much parameters”.
+   Improved a implementation of the `Dispose` method.
 
    ============
    PROJECT SITE