huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge errors

This commit is contained in:
Yishai Galatzer 2014-03-27 11:01:04 -07:00
parent 70e26a80ad
commit db7b36a859
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
View File

@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Routing.Template
private readonly IDictionary<string, object> _defaults; private readonly IDictionary<string, object> _defaults;
private readonly IDictionary<string, IRouteConstraint> _constraints; private readonly IDictionary<string, IRouteConstraint> _constraints;
private readonly IRouter _target; private readonly IRouter _target;
private readonly Template _parsedTemplate;
private readonly string _routeTemplate; private readonly string _routeTemplate;
private readonly TemplateMatcher _matcher; private readonly TemplateMatcher _matcher;
private readonly TemplateBinder _binder; private readonly TemplateBinder _binder;
@ -29,9 +30,9 @@ namespace Microsoft.AspNet.Routing.Template
_constraints = RouteConstraintBuilder.BuildConstraints(constraints, _routeTemplate); _constraints = RouteConstraintBuilder.BuildConstraints(constraints, _routeTemplate);
// The parser will throw for invalid routes. // The parser will throw for invalid routes.
var parsedTemplate = TemplateParser.Parse(RouteTemplate); _parsedTemplate = TemplateParser.Parse(RouteTemplate);
_matcher = new TemplateMatcher(parsedTemplate); _matcher = new TemplateMatcher(_parsedTemplate);
_binder = new TemplateBinder(_parsedTemplate, _defaults); _binder = new TemplateBinder(_parsedTemplate, _defaults);
} }