timers: remove domain specific code

apapirovski · MylesBorins · commit 146e8ac83a3a · 2018-02-21T10:19:11.000-05:00
It is no longer necessary to explicitly set the handle to inherit the Timeout domain. PR-URL: #18477 Refs: #16222 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Khaidi Chu <i@2333.moe> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/lib/timers.js b/lib/timers.js
@@ -603,7 +603,6 @@ Timeout.prototype.unref = function() {
     this._handle.owner = this;
     this._handle[kOnTimeout] = unrefdHandle;
     this._handle.start(delay);
-    this._handle.domain = this.domain;
     this._handle.unref();
   }
   return this;
diff --git a/test/parallel/test-domain-timers.js b/test/parallel/test-domain-timers.js
@@ -30,13 +30,19 @@ timeoutd.on('error', common.mustCall(function(e) {
   assert.strictEqual(e.message, 'Timeout UNREFd',
                      'Domain should catch timer error');
   clearTimeout(timeout);
-}));
+}, 2));
 
+let t;
 timeoutd.run(function() {
   setTimeout(function() {
     throw new Error('Timeout UNREFd');
   }, 0).unref();
+
+  t = setTimeout(function() {
+    throw new Error('Timeout UNREFd');
+  }, 0);
 });
+t.unref();
 
 const immediated = domain.create();
 

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,6 @@ Timeout.prototype.unref = function() {`
`603`	`603`	`this._handle.owner = this;`
`604`	`604`	`this._handle[kOnTimeout] = unrefdHandle;`
`605`	`605`	`this._handle.start(delay);`
`606`		`- this._handle.domain = this.domain;`
`607`	`606`	`this._handle.unref();`
`608`	`607`	`}`
`609`	`608`	`return this;`