diff options
| author | Chetan Karande <kchetan.tech@gmail.com> | 2019-09-21 10:12:13 -0400 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-09-25 18:21:06 +0200 |
| commit | b1008973e9a30ece4a2016fce1b58bec49e4127b (patch) | |
| tree | 625030359abf56abf24bc592da9056b68b21bde2 | |
| parent | b7488c2a5c5e354809e98a1a02b2be5a8ef907f8 (diff) | |
| download | node-new-b1008973e9a30ece4a2016fce1b58bec49e4127b.tar.gz | |
stream: cleanup use of internal ended state
PR-URL: https://github.com/nodejs/node/pull/29645
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
| -rw-r--r-- | lib/internal/http2/compat.js | 2 | ||||
| -rw-r--r-- | lib/internal/worker.js | 4 | ||||
| -rw-r--r-- | lib/net.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js index 9cf19250a8..2d6ed47d74 100644 --- a/lib/internal/http2/compat.js +++ b/lib/internal/http2/compat.js @@ -303,7 +303,7 @@ class Http2ServerRequest extends Readable { get complete() { return this[kAborted] || - this._readableState.ended || + this.readableEnded || this[kState].closed || this[kStream].destroyed; } diff --git a/lib/internal/worker.js b/lib/internal/worker.js index df0646ff4f..fc6588d527 100644 --- a/lib/internal/worker.js +++ b/lib/internal/worker.js @@ -207,11 +207,11 @@ class Worker extends EventEmitter { const { stdout, stderr } = this[kParentSideStdio]; - if (!stdout._readableState.ended) { + if (!stdout.readableEnded) { debug(`[${threadId}] explicitly closes stdout for ${this.threadId}`); stdout.push(null); } - if (!stderr._readableState.ended) { + if (!stderr.readableEnded) { debug(`[${threadId}] explicitly closes stderr for ${this.threadId}`); stderr.push(null); } diff --git a/lib/net.js b/lib/net.js index 1eb1d212cd..760bf084f4 100644 --- a/lib/net.js +++ b/lib/net.js @@ -422,7 +422,7 @@ function afterShutdown(status) { if (self.destroyed) return; - if (!self.readable || self._readableState.ended) { + if (!self.readable || self.readableEnded) { debug('readableState ended, destroying'); self.destroy(); } |