Prioritize custom handler, fall back on DefaultStatusCodeHandler

NancyFx · Aug 31, 2014 · 7f57b20 · 7f57b20
1 parent 3370ee8
commit 7f57b20
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Nancy/NancyEngine.cs b/src/Nancy/NancyEngine.cs
@@ -187,9 +187,17 @@ private void CheckStatusCodeHandler(NancyContext context)
                 return;
             }
 
-            var handler = this.statusCodeHandlers
-                .FirstOrDefault(x => x.HandlesStatusCode(context.Response.StatusCode, context));
+            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)
             {
                 return;