From c41be75796d9c81d9dde079c45958a2d54c31a63 Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 14 Dec 2015 13:22:42 -0800 Subject: [PATCH] Wrap Branch in try finally --- .../Extensions/MapMiddleware.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs index 2b2c80b0..1c66aea8 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs +++ b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs @@ -57,10 +57,15 @@ public async Task Invoke(HttpContext context) context.Request.PathBase = pathBase + _options.PathMatch; context.Request.Path = remainingPath; - await _options.Branch(context); - - context.Request.PathBase = pathBase; - context.Request.Path = path; + try + { + await _options.Branch(context); + } + finally + { + context.Request.PathBase = pathBase; + context.Request.Path = path; + } } else {