diff options
author | Chetan Karande <kchetan.tech@gmail.com> | 2019-09-21 10:12:13 -0400 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2019-09-24 06:42:56 +0200 |
commit | fed05cc414fabb4aaacefa86df645637413164f1 (patch) | |
tree | 2141c7262a41083fa678610c675ed5c335c071a3 | |
parent | 06929956f9c438d29ca127d8be147e7969bfae35 (diff) | |
download | android-node-v8-fed05cc414fabb4aaacefa86df645637413164f1.tar.gz android-node-v8-fed05cc414fabb4aaacefa86df645637413164f1.tar.bz2 android-node-v8-fed05cc414fabb4aaacefa86df645637413164f1.zip |
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(); } |