nodejs
diff --git a/Collapse file
‎lib/internal/worker.js‎
Copy file name to clipboardExpand all lines: lib/internal/worker.js
+3-2Lines changed: 3 additions & 2 deletions b/Collapse file
‎lib/internal/worker.js‎
Copy file name to clipboardExpand all lines: lib/internal/worker.js
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/Collapse file
‎test/parallel/test-worker-terminate-null-handler.js‎
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions b/Collapse file
‎test/parallel/test-worker-terminate-null-handler.js‎
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions
@@ -224,18 +224,19 @@ class Worker extends EventEmitter {
   }
 
   terminate(callback) {
-    if (this[kHandle] === null) return;
-
     debug(`[${threadId}] terminates Worker with ID ${this.threadId}`);
 
     if (typeof callback === 'function') {
       process.emitWarning(
         'Passing a callback to worker.terminate() is deprecated. ' +
         'It returns a Promise instead.',
         'DeprecationWarning', 'DEP0132');
+      if (this[kHandle] === null) return Promise.resolve();
       this.once('exit', (exitCode) => callback(null, exitCode));
     }
 
+    if (this[kHandle] === null) return Promise.resolve();
+
     this[kHandle].stopThread();
 
     // Do not use events.once() here, because the 'exit' event will always be
 
@@ -0,0 +1,27 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { Worker } = require('worker_threads');
+
+// Test that calling worker.terminate() if kHandler is null should return an
+// empty promise that resolves to undefined, even when a callback is passed
+
+const worker = new Worker(`
+const { parentPort } = require('worker_threads');
+parentPort.postMessage({ hello: 'world' });
+`, { eval: true });
+
+process.once('beforeExit', common.mustCall(() => {
+  console.log('beforeExit');
+  worker.ref();
+}));
+
+worker.on('exit', common.mustCall(() => {
+  console.log('exit');
+  worker.terminate().then((res) => assert.strictEqual(res, undefined));
+  worker.terminate(() => null).then(
+    (res) => assert.strictEqual(res, undefined)
+  );
+}));
+
+worker.unref();