Merge 7d1e052 into cd17796

jstty · Sep 6, 2018 · cda7907 · cda7907
2 parents cd17796 + 7d1e052
commit cda7907
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/legacy/http.framework.express.js b/legacy/http.framework.express.js
@@ -330,7 +330,9 @@ HttpFrameworkExpress.prototype.addWrappedMethodFunction = function (method, midd
       }
 
       // merge default content-type with headers
-      res.writeHead(output.code, output.headers);
+      if (!res.headersSent) {
+        res.writeHead(output.code, output.headers);
+      }
 
       if (Buffer.isBuffer(output.data)) {
         res.end(output.data, 'binary');

diff --git a/legacy/service.middleware/apiviewRoutes.js b/legacy/service.middleware/apiviewRoutes.js
@@ -303,6 +303,11 @@ var ApiViewRoutes = function (_ServiceMiddleware) {
   }, {
     key: '_handlerWrapper',
     value: function _handlerWrapper(handlerFunc, resolved, skipOnError, service, controller, orgOutput) {
+      // do nothing if a response has already been sent
+      if (resolved['$rawResponse'].finished) {
+        return when.resolve({});
+      }
+
       if (!orgOutput) {
         orgOutput = { out: null, code: 200, headers: null };
       }

diff --git a/lib/http.framework.express.js b/lib/http.framework.express.js
@@ -355,7 +355,9 @@ HttpFrameworkExpress.prototype.addWrappedMethodFunction = function (method, midd
         }
 
         // merge default content-type with headers
-        res.writeHead(output.code, output.headers);
+        if (!res.headersSent) {
+          res.writeHead(output.code, output.headers);
+        }
 
         if (Buffer.isBuffer(output.data)) {
           res.end(output.data, 'binary');

diff --git a/lib/service.middleware/apiviewRoutes.js b/lib/service.middleware/apiviewRoutes.js
@@ -273,6 +273,11 @@ class ApiViewRoutes extends ServiceMiddleware {
 
   // TODO: to many input, need some work
   _handlerWrapper (handlerFunc, resolved, skipOnError, service, controller, orgOutput) {
+    // do nothing if a response has already been sent
+    if (resolved['$rawResponse'].finished) {
+      return when.resolve({});
+    }
+
     if (!orgOutput) {
       orgOutput = { out: null, code: 200, headers: null };
     }