Reorg lines

hapijs · Jan 2, 2016 · d34f0de · d34f0de
1 parent e724897
commit d34f0de
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/lib/transmit.js b/lib/transmit.js
@@ -285,10 +285,6 @@ internals.transmit = function (response, callback) {
 
     request.raw.res.writeHead(response.statusCode);
 
-    // Generate tap stream
-
-    const tap = response._tap();
-
     // Write payload
 
     let hasEnded = false;
@@ -324,19 +320,19 @@ internals.transmit = function (response, callback) {
         }
 
         request._log(tags, err);
-        callback();
+        return callback();
     };
 
     source.once('error', end);
 
     const onAborted = () => {
 
-        end(null, 'aborted');
+        return end(null, 'aborted');
     };
 
     const onClose = () => {
 
-        end(null, 'close');
+        return end(null, 'close');
     };
 
     request.raw.req.once('aborted', onAborted);
@@ -346,6 +342,7 @@ internals.transmit = function (response, callback) {
     request.raw.res.once('error', end);
     request.raw.res.once('finish', end);
 
+    const tap = response._tap();
     const preview = (tap ? source.pipe(tap) : source);
     const compressed = (compressor ? preview.pipe(compressor) : preview);
     const ranged = (ranger ? compressed.pipe(ranger) : compressed);