Merge pull request #100 from 95ulisse/master

Make 204 responses pass through the outputFn
florianholzapfel · Mar 5, 2015 · 978be7d · 978be7d
2 parents 563e0a7 + c1e02e8
commit 978be7d
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/lib/express-restify-mongoose.js b/lib/express-restify-mongoose.js
@@ -58,11 +58,19 @@ function getDefaults() {
 }
 
 function outputExpress(res, result, statusCode) {
-    res.status(statusCode || 200).json(result);
+    if (result !== null) {
+        res.status(statusCode || 200).json(result);
+    } else {
+        res.status(statusCode || 200).end();
+    }
 }
 
 function outputRestify(res, result, statusCode) {
-    res.send(statusCode || 200, result);
+    if (result !== null) {
+        res.send(statusCode || 200, result);
+    } else {
+        res.send(statusCode || 200);
+    }
 }
 
 var restify = function(app, model, opts) {
@@ -658,11 +666,7 @@ var restify = function(app, model, opts) {
                         onError(createError(400, err), req, res, next);
                     } else {
                         // 204 - No Content
-                        if(usingExpress) {
-                            res.status(204).end();
-                        } else {
-                            res.send(204);
-                        }
+                        outputFn(res, null, 204);
                         next();
                     }
                 });
@@ -727,11 +731,7 @@ var restify = function(app, model, opts) {
                             }
                             else {
                                 // 204 - No Content
-                                if(usingExpress) {
-                                    res.status(204).end();
-                                } else {
-                                    res.send(204);
-                                }
+                                outputFn(res, null, 204);
                                 next();
                             }
                         });
@@ -751,11 +751,7 @@ var restify = function(app, model, opts) {
                                 }
                                 else {
                                     // 204 - No Content
-                                    if(usingExpress) {
-                                        res.status(204).end();
-                                    } else {
-                                        res.send(204);
-                                    }
+                                    outputFn(res, null, 204);
                                     next();
                                 }
                             });