Merge pull request #1668 from khellang/single-status-code-handler

Break when status code has been handled
NancyFx · Aug 19, 2015 · bdc5cf4 · bdc5cf4
2 parents eca21b4 + 7bac92f
commit bdc5cf4
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/Nancy/NancyEngine.cs b/src/Nancy/NancyEngine.cs
@@ -197,13 +197,23 @@ private void CheckStatusCodeHandler(NancyContext context)
                 return;
             }
 
-            foreach (var statusCodeHandler in this.statusCodeHandlers)
+            var handlers = this.statusCodeHandlers
+                .Where(x => x.HandlesStatusCode(context.Response.StatusCode, context))
+                .ToList();
+
+            var defaultHandler = handlers
+                .FirstOrDefault(x => x is DefaultStatusCodeHandler);
+
+            var customHandler = handlers
+                .FirstOrDefault(x => !(x is DefaultStatusCodeHandler));
+
+            var handler = customHandler ?? defaultHandler;
+            if (handler == null)
             {
-                if (statusCodeHandler.HandlesStatusCode(context.Response.StatusCode, context))
-                {
-                    statusCodeHandler.Handle(context.Response.StatusCode, context);
-                }
+                return;
             }
+
+            handler.Handle(context.Response.StatusCode, context);
         }
 
         private Task<NancyContext> InvokeRequestLifeCycle(NancyContext context, CancellationToken cancellationToken, IPipelines pipelines)