summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-01-25 00:43:06 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2018-02-01 10:53:53 +0100
commit5898dc3d0c071a8e5135ba0a80565dd19d49cb32 (patch)
tree8bf1fd4236b183dfd8509b8d5bc43ec7f659f14a /lib
parent7c4b09b24bbe7d6a8cbad256f47b30a101a909ea (diff)
downloadandroid-node-v8-5898dc3d0c071a8e5135ba0a80565dd19d49cb32.tar.gz
android-node-v8-5898dc3d0c071a8e5135ba0a80565dd19d49cb32.tar.bz2
android-node-v8-5898dc3d0c071a8e5135ba0a80565dd19d49cb32.zip
src: simplify handles for libuv streams
Instead of passing along the handle object, just set it as a property on the stream handle object and let the read handler grab it from there. PR-URL: https://github.com/nodejs/node/pull/18334 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/child_process.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index eb17ec21d4..2bade01f95 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -465,7 +465,10 @@ function setupChannel(target, channel) {
var jsonBuffer = '';
var pendingHandle = null;
channel.buffering = false;
- channel.onread = function(nread, pool, recvHandle) {
+ channel.pendingHandle = null;
+ channel.onread = function(nread, pool) {
+ const recvHandle = channel.pendingHandle;
+ channel.pendingHandle = null;
// TODO(bnoordhuis) Check that nread > 0.
if (pool) {
if (recvHandle)