From e7ade37b3ff21ab7563bf14257dd2d802ad4fb5b Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Sat, 14 Dec 2013 16:11:13 -0800
Subject: [PATCH] Moved the routing up a level.

---
 Microsoft.AspNet.Mvc/MvcHandler.cs | 7 ++++---
 MvcSample/Startup.cs               | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Microsoft.AspNet.Mvc/MvcHandler.cs b/Microsoft.AspNet.Mvc/MvcHandler.cs
index e83dc28257..b93149b272 100644
--- a/Microsoft.AspNet.Mvc/MvcHandler.cs
+++ b/Microsoft.AspNet.Mvc/MvcHandler.cs
@@ -20,12 +20,13 @@ namespace Microsoft.AspNet.Mvc
             _serviceProvider = serviceProvider ?? MvcServices.Create();
         }
 
-        public Task ExecuteAsync(IOwinContext context)
+        public Task ExecuteAsync(IOwinContext context, IRouteData routeData)
         {
-            var routeData = new FakeRouteData(context);
+            var requestContext = new RequestContext(context, routeData);
 
             IActionInvokerFactory invokerFactory = _serviceProvider.GetService<IActionInvokerFactory>();
-            var invoker = invokerFactory.CreateInvoker(new RequestContext(context, routeData));
+
+            var invoker = invokerFactory.CreateInvoker(requestContext);
 
             return invoker.InvokeActionAsync();
         }
diff --git a/MvcSample/Startup.cs b/MvcSample/Startup.cs
index 216d97a5a4..5b3d053578 100644
--- a/MvcSample/Startup.cs
+++ b/MvcSample/Startup.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Owin;
 using Owin;
 
@@ -16,10 +17,12 @@ namespace MvcSample
 
             var handler = new MvcHandler();
 
-            // Pretending to be routing
             app.Run(async context =>
             {
-                await handler.ExecuteAsync(context);
+                // Pretending to be routing
+                var routeData = new FakeRouteData(context);
+
+                await handler.ExecuteAsync(context, routeData);
             });
         }
     }