method stream.read refactored.

vitaly-t · Nov 2, 2015 · 73a42f4 · 73a42f4
1 parent a548fe9
commit 73a42f4
Showing 1 changed file with 4 additions and 20 deletions.
diff --git a/lib/ext/stream/read.js b/lib/ext/stream/read.js
@@ -83,24 +83,11 @@ function read(stream, receiver, closable, readSize) {
             process();
         }
 
-        function onEnd() {
-            if (!closable) {
-                success();
-            }
-        }
-
-        function onClose() {
-            success();
-        }
-
-        function onError(error) {
-            fail(error);
-        }
-
         stream.on('readable', onReadable);
-        stream.on('end', onEnd);
-        stream.on('close', onClose);
-        stream.on('error', onError);
+        stream.once(closable ? 'close' : 'end', success);
+        stream.once('error', function (error) {
+            fail(error);
+        });
 
         function process() {
             if (!ready || stop || waiting) {
@@ -168,9 +155,6 @@ function read(stream, receiver, closable, readSize) {
 
         function cleanup() {
             stream.removeListener('readable', onReadable);
-            stream.removeListener('close', onClose);
-            stream.removeListener('error', onError);
-            stream.removeListener('end', onEnd);
         }
     });
 }