summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2018-03-13 21:07:10 +0800
committerAnna Henningsen <anna@addaleax.net>2018-03-15 15:39:11 +0100
commit855dabd675f3d1b06130bd1b92a131dca89f5eda (patch)
tree7d958bb74d06214315403549901cde5372b16fad
parentc6ae8a28109fc19ea30a5d785b2215345564c0bb (diff)
downloadandroid-node-v8-855dabd675f3d1b06130bd1b92a131dca89f5eda.tar.gz
android-node-v8-855dabd675f3d1b06130bd1b92a131dca89f5eda.tar.bz2
android-node-v8-855dabd675f3d1b06130bd1b92a131dca89f5eda.zip
src: call CleanupHandles in FreeEnvironment
CleanupHandles() has not been called in our own code base anymore after the v8 debug agent has been removed. It used to be in the ~Environment() destructor but then removed to avoid firing other events after the exit event, given that we were not going to clean up handles for the one environment per process setup. Call it in FreeEnvironment so that embedders can clean up the handles in the loop when creating multiple environments. PR-URL: https://github.com/nodejs/node/pull/19319 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jackson Tian <shyvo1987@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--src/node.cc1
-rw-r--r--test/cctest/node_test_fixture.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/node.cc b/src/node.cc
index 33065cd504..4833ef0fd1 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -4405,6 +4405,7 @@ Environment* CreateEnvironment(IsolateData* isolate_data,
void FreeEnvironment(Environment* env) {
+ env->CleanupHandles();
delete env;
}
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index 660111c5a9..e0740a4709 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -118,7 +118,6 @@ class EnvironmentTestFixture : public NodeTestFixture {
}
~Env() {
- environment_->CleanupHandles();
node::FreeEnvironment(environment_);
node::FreeIsolateData(isolate_data_);
context_->Exit();