handle thrown errors inside Route

close #2029
expressjs · Apr 8, 2014 · d72f279 · d72f279
1 parent 1ee5329
commit d72f279
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/lib/router/route.js b/lib/router/route.js
@@ -87,14 +87,23 @@ Route.prototype.dispatch = function(req, res, done){
         return next_layer(err);
       }
 
-      return layer.handle(err, req, res, next_layer);
+      try {
+        layer.handle(err, req, res, next_layer);
+      } catch (err) {
+        next_layer(err);
+      }
+      return;
     }
 
     if (arity > 3) {
       return next_layer();
     }
 
-    layer.handle(req, res, next_layer);
+    try {
+      layer.handle(req, res, next_layer);
+    } catch (err) {
+      next_layer(err);
+    }
   })();
 };
 

diff --git a/test/Route.js b/test/Route.js
@@ -140,5 +140,32 @@ describe('Route', function(){
 
       route.dispatch({ method: 'get' }, {});
     })
+
+    it('should handle throw', function(done) {
+      var route = new Route('');
+
+      var order = '';
+      route.all(function(req, res, next){
+        throw new Error('foobar');
+      });
+
+      route.all(function(req, res, next){
+        order += '0';
+        next();
+      });
+
+      route.all(function(err, req, res, next){
+        order += 'a';
+        next(err);
+      });
+
+      route.all(function(err, req, res, next){
+        assert.equal(err.message, 'foobar');
+        assert.equal(order, 'a');
+        done();
+      });
+
+      route.dispatch({ method: 'get' }, {});
+    });
   })
 })