Cleanup for hapijs#2243

Eran Hammer · Eran Hammer · commit d1fc5573dd1c · 2014-12-02T14:09:21.000-08:00
diff --git a/lib/handler.js b/lib/handler.js
@@ -68,7 +68,7 @@ internals.handler = function (request, callback) {
     var timer = new Hoek.Bench();
     var finalize = function (response, data) {
 
-        if (response === null) {            // reply.continue()
+        if (response === null) {                            // reply.continue()
             response = Response.wrap(null, request);
             return response._prepare(null, finalize);
         }
@@ -253,6 +253,11 @@ internals.pre = function (pre) {
         var timer = new Hoek.Bench();
         var finalize = function (response, data) {
 
+            if (response === null) {                            // reply.continue()
+                response = Response.wrap(null, request);
+                return response._prepare(null, finalize);
+            }
+
             if (response instanceof Error) {
                 if (pre.failAction !== 'ignore') {
                     request._log(['pre', 'error'], { msec: timer.elapsed(), assign: pre.assign, error: response });
@@ -262,10 +267,6 @@ internals.pre = function (pre) {
                     return next(response);
                 }
             }
-            else if (response === null) {            // reply.continue()
-                response = Response.wrap(null, request);
-                return response._prepare(null, finalize);
-            }
             else {
                 request._log(['pre'], { msec: timer.elapsed(), assign: pre.assign });
             }
