Commit e7b8400
http: replace finish() callback with arrow function
Take advantage of arrow function lexical `this` to avoid defining a
`self = this` var which was only used once.
Code relating to the `finish` event was split in to two areas of the
parent function. Gathered it together to clarify association within the
script.
Fixes: #7295
PR-URL: #7378
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 44bc638 commit e7b8400
1 file changed
Lines changed: 7 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -546,14 +546,6 @@ OutgoingMessage.prototype.end = function(data, encoding, callback) { | |||
| 546 | 546 | return false; | |
| 547 | 547 | } | |
| 548 | 548 | ||
| 549 | - var self = this; | ||
| 550 | - function finish() { | ||
| 551 | - self.emit('finish'); | ||
| 552 | - } | ||
| 553 | - | ||
| 554 | - if (typeof callback === 'function') | ||
| 555 | - this.once('finish', callback); | ||
| 556 | - | ||
| 557 | 549 | if (!this._header) { | |
| 558 | 550 | if (data) { | |
| 559 | 551 | if (typeof data === 'string') | |
@@ -581,6 +573,13 @@ OutgoingMessage.prototype.end = function(data, encoding, callback) { | |||
| 581 | 573 | this.write(data, encoding); | |
| 582 | 574 | } | |
| 583 | 575 | ||
| 576 | + if (typeof callback === 'function') | ||
| 577 | + this.once('finish', callback); | ||
| 578 | + | ||
| 579 | + const finish = () => { | ||
| 580 | + this.emit('finish'); | ||
| 581 | + }; | ||
| 582 | + | ||
| 584 | 583 | if (this._hasBody && this.chunkedEncoding) { | |
| 585 | 584 | ret = this._send('0\r\n' + this._trailer + '\r\n', 'binary', finish); | |
| 586 | 585 | } else { | |
0 commit comments