From 927821a8acbedf8c5adde8f916cb579584375d48 Mon Sep 17 00:00:00 2001
From: harshgMSFT <harshg@microsoft.com>
Date: Tue, 5 Aug 2014 16:22:43 -0700
Subject: [PATCH] Data Token support changes

---
 samples/MvcSample.Web/HomeController.cs                   | 6 ++++++
 samples/MvcSample.Web/Startup.cs                          | 4 +++-
 src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/samples/MvcSample.Web/HomeController.cs b/samples/MvcSample.Web/HomeController.cs
index 91768f995f..0fce895466 100644
--- a/samples/MvcSample.Web/HomeController.cs
+++ b/samples/MvcSample.Web/HomeController.cs
@@ -34,6 +34,12 @@ namespace MvcSample.Web
             return HttpNotFound();
         }
 
+        public bool IsDefaultNameSpace()
+        {
+            var namespaceToken = ActionContext.RouteData.DataTokens["NameSpace"] as string;
+            return namespaceToken == "default";
+        }
+
         /// <summary>
         /// Action that shows metadata when model is <c>null</c>.
         /// </summary>
diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs
index e6631bade2..0e7e17a55a 100644
--- a/samples/MvcSample.Web/Startup.cs
+++ b/samples/MvcSample.Web/Startup.cs
@@ -73,7 +73,9 @@ namespace MvcSample.Web
                 routes.MapRoute(
                     "controllerActionRoute",
                     "{controller}/{action}",
-                    new { controller = "Home", action = "Index" });
+                    new { controller = "Home", action = "Index" },
+                    constraints: null,
+                    dataTokens: new { NameSpace = "default" });
 
                 routes.MapRoute(
                     "controllerRoute",
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
index 346b6ef52d..1d58af6bc7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs
@@ -66,6 +66,7 @@ namespace Microsoft.AspNet.Mvc.Routing
                             { RouteGroupKey, routeInfo.RouteGroup },
                         },
                         constraints: null,
+                        dataTokens: null,
                         inlineConstraintResolver: inlineConstraintResolver),
                 });
             }