Version 1.4.2 (Fixed JavaScriptEngineSwitcher.Msie's bug #5 "MSIE "Catastrophic failure" when disposing")

Taritsyn · Taritsyn · commit 8a2b9b55fc0d · 2014-03-24T14:53:41.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Change log
 ==========
 
+## March 24, 2014 - v1.4.2
+ * Fixed [JavaScriptEngineSwitcher.Msie's bug #5](http://github.com/Taritsyn/JavaScriptEngineSwitcher/issues/5) "MSIE "Catastrophic failure" when disposing"
+
 ## March 22, 2014 - v1.4.1
  * Fixed minor bugs
 
diff --git a/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs b/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs
@@ -257,6 +257,11 @@ private void ExecuteResource(string resourceName, Type type)
 		/// <param name="disposing">Flag, allowing destruction of 
 		/// managed objects contained in fields of class</param>
 		private void Dispose(bool disposing)
+		{
+			_dispatcher.Invoke(DispatcherPriority.Input, (Action)InnerDispose);
+		}
+
+		private void InnerDispose()
 		{
 			if (!_disposed)
 			{
diff --git a/MsieJavaScriptEngine/JsRt/ChakraJsRtJsEngine.cs b/MsieJavaScriptEngine/JsRt/ChakraJsRtJsEngine.cs
@@ -33,9 +33,9 @@ internal sealed class ChakraJsRtJsEngine : IInnerJsEngine
 		private readonly JavaScriptContext _jsContext;
 
 		/// <summary>
-		/// Synchronizer of code execution
+		/// Synchronizer
 		/// </summary>
-		private readonly object _executionSynchronizer = new object();
+		private readonly object _synchronizer = new object();
 
 		/// <summary>
 		/// Flag that object is destroyed
@@ -272,7 +272,7 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(
 
 		private void InvokeScript(Action action)
 		{
-			lock (_executionSynchronizer)
+			lock (_synchronizer)
 			using (new JavaScriptContext.Scope(_jsContext))
 			{
 				try
@@ -288,7 +288,7 @@ private void InvokeScript(Action action)
 
 		private T InvokeScript<T>(Func<T> func)
 		{
-			lock (_executionSynchronizer)
+			lock (_synchronizer)
 			using (new JavaScriptContext.Scope(_jsContext))
 			{
 				try
@@ -309,11 +309,14 @@ private T InvokeScript<T>(Func<T> func)
 		/// managed objects contained in fields of class</param>
 		private void Dispose(bool disposing)
 		{
-			if (!_disposed)
+			lock (_synchronizer)
 			{
-				_disposed = true;
+				if (!_disposed)
+				{
+					_disposed = true;
 
-				_jsRuntime.Dispose();
+					_jsRuntime.Dispose();
+				}
 			}
 		}
 
diff --git a/MsieJavaScriptEngine/Properties/AssemblyInfo.cs b/MsieJavaScriptEngine/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
 
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
 
 [module: DefaultCharSet(CharSet.Unicode)]
diff --git a/NuGet/MsieJavaScriptEngine.nuspec b/NuGet/MsieJavaScriptEngine.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MsieJavaScriptEngine</id>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
 	<title>MSIE JavaScript Engine for .NET</title>
     <authors>Andrey Taritsyn</authors>
     <owners>Andrey Taritsyn</owners>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host).</description>
     <summary>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-	<releaseNotes>Fixed minor bugs.</releaseNotes>
+	<releaseNotes>Fixed JavaScriptEngineSwitcher.Msie's bug #5 "MSIE "Catastrophic failure" when disposing".</releaseNotes>
 	<copyright>Copyright 2014 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
     <language>en-US</language>
     <tags>JavaScript ECMAScript MSIE IE Chakra</tags>
diff --git a/NuGet/readme.txt b/NuGet/readme.txt
@@ -1,7 +1,7 @@
 
 
    ----------------------------------------------------------------------
-           README file for MSIE JavaScript Engine for .NET 1.4.1
+           README file for MSIE JavaScript Engine for .NET 1.4.2
 
    ----------------------------------------------------------------------
 
@@ -21,7 +21,8 @@
    =============
    RELEASE NOTES
    =============
-   Fixed minor bugs.
+   Fixed JavaScriptEngineSwitcher.Msie's bug #5 "MSIE "Catastrophic
+   failure" when disposing".
 
    ============
    PROJECT SITE

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,11 @@ private void ExecuteResource(string resourceName, Type type)`
`257`	`257`	`/// <param name="disposing">Flag, allowing destruction of`
`258`	`258`	`/// managed objects contained in fields of class</param>`
`259`	`259`	`private void Dispose(bool disposing)`
	`260`	`+ {`
	`261`	`+ _dispatcher.Invoke(DispatcherPriority.Input, (Action)InnerDispose);`
	`262`	`+ }`
	`263`	`+`
	`264`	`+ private void InnerDispose()`
`260`	`265`	`{`
`261`	`266`	`if (!_disposed)`
`262`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ internal sealed class ChakraJsRtJsEngine : IInnerJsEngine`
`33`	`33`	`private readonly JavaScriptContext _jsContext;`
`34`	`34`
`35`	`35`	`/// <summary>`
`36`		`- /// Synchronizer of code execution`
	`36`	`+ /// Synchronizer`
`37`	`37`	`/// </summary>`
`38`		`- private readonly object _executionSynchronizer = new object();`
	`38`	`+ private readonly object _synchronizer = new object();`
`39`	`39`
`40`	`40`	`/// <summary>`
`41`	`41`	`/// Flag that object is destroyed`
`@@ -272,7 +272,7 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(`
`272`	`272`
`273`	`273`	`private void InvokeScript(Action action)`
`274`	`274`	`{`
`275`		`- lock (_executionSynchronizer)`
	`275`	`+ lock (_synchronizer)`
`276`	`276`	`using (new JavaScriptContext.Scope(_jsContext))`
`277`	`277`	`{`
`278`	`278`	`try`
`@@ -288,7 +288,7 @@ private void InvokeScript(Action action)`
`288`	`288`
`289`	`289`	`private T InvokeScript<T>(Func<T> func)`
`290`	`290`	`{`
`291`		`- lock (_executionSynchronizer)`
	`291`	`+ lock (_synchronizer)`
`292`	`292`	`using (new JavaScriptContext.Scope(_jsContext))`
`293`	`293`	`{`
`294`	`294`	`try`
`@@ -309,11 +309,14 @@ private T InvokeScript<T>(Func<T> func)`
`309`	`309`	`/// managed objects contained in fields of class</param>`
`310`	`310`	`private void Dispose(bool disposing)`
`311`	`311`	`{`
`312`		`- if (!_disposed)`
	`312`	`+ lock (_synchronizer)`
`313`	`313`	`{`
`314`		`- _disposed = true;`
	`314`	`+ if (!_disposed)`
	`315`	`+ {`
	`316`	`+ _disposed = true;`
`315`	`317`
`316`		`- _jsRuntime.Dispose();`
	`318`	`+ _jsRuntime.Dispose();`
	`319`	`+ }`
`317`	`320`	`}`
`318`	`321`	`}`
`319`	`322`