Skip to content

Commit 257d985

Browse files
committed
Fixed a error #18 “Block finalizer solved?”
1 parent f0db86d commit 257d985

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
lines changed

src/MsieJavaScriptEngine/JsRt/ChakraJsRtJsEngineBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal abstract class ChakraJsRtJsEngineBase : InnerJsEngineBase
3838
/// <summary>
3939
/// Script dispatcher
4040
/// </summary>
41-
protected readonly ScriptDispatcher _dispatcher = new ScriptDispatcher();
41+
protected ScriptDispatcher _dispatcher = new ScriptDispatcher();
4242

4343

4444
/// <summary>

src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1390,16 +1390,15 @@ protected override void Dispose(bool disposing)
13901390
{
13911391
if (_dispatcher != null)
13921392
{
1393-
_dispatcher.Invoke(() =>
1394-
{
1395-
if (_jsContext.IsValid)
1396-
{
1397-
_jsContext.Release();
1398-
}
1399-
_jsRuntime.Dispose();
1400-
});
14011393
_dispatcher.Dispose();
1394+
_dispatcher = null;
1395+
}
1396+
1397+
if (_jsContext.IsValid)
1398+
{
1399+
_jsContext.Release();
14021400
}
1401+
_jsRuntime.Dispose();
14031402

14041403
base.Dispose(disposing);
14051404
#if NETSTANDARD

src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1455,16 +1455,15 @@ protected override void Dispose(bool disposing)
14551455
{
14561456
if (_dispatcher != null)
14571457
{
1458-
_dispatcher.Invoke(() =>
1459-
{
1460-
if (_jsContext.IsValid)
1461-
{
1462-
_jsContext.Release();
1463-
}
1464-
_jsRuntime.Dispose();
1465-
});
14661458
_dispatcher.Dispose();
1459+
_dispatcher = null;
1460+
}
1461+
1462+
if (_jsContext.IsValid)
1463+
{
1464+
_jsContext.Release();
14671465
}
1466+
_jsRuntime.Dispose();
14681467

14691468
base.Dispose(disposing);
14701469
#if NETSTANDARD

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
<RepositoryUrl>https://github.com/Taritsyn/MsieJavaScriptEngine</RepositoryUrl>
2525
<RepositoryType>git</RepositoryType>
2626
<PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
27-
<PackageReleaseNotes>1. In `MsieJsEngine` class was added `SupportsScriptPrecompilation` property and three new methods: `Precompile`, `PrecompileFile` and `PrecompileResource`;
28-
2. In JsRT modes added a ability to pre-compile scripts.</PackageReleaseNotes>
27+
<PackageReleaseNotes>Fixed a error #18 “Block finalizer solved?”.</PackageReleaseNotes>
2928
<NeutralLanguage>en-US</NeutralLanguage>
3029
<PackageOutputPath>../../nuget</PackageOutputPath>
3130
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/MsieJavaScriptEngine/readme.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
=============
2222
RELEASE NOTES
2323
=============
24-
1. In `MsieJsEngine` class was added `SupportsScriptPrecompilation` property and
25-
three new methods: `Precompile`, `PrecompileFile` and `PrecompileResource`;
26-
2. In JsRT modes added a ability to pre-compile scripts.
24+
Fixed a error #18 “Block finalizer solved?”.
2725

2826
============
2927
PROJECT SITE

0 commit comments

Comments
 (0)