Fix NullReferenceException in unversioned route constraint. Fixes #531

Chris Martinez · Chris Martinez · commit cb7888b9cbb9 · 2019-08-10T10:44:59.000-07:00
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/UnversionedODataPathRouteConstraint.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/UnversionedODataPathRouteConstraint.cs
@@ -50,7 +50,7 @@ public bool Match( HttpContext httpContext, IRouter route, string routeKey, Rout
                 // is implicitly matching an api version allowed?
                 if ( options.AssumeDefaultVersionWhenUnspecified || IsServiceDocumentOrMetadataRoute( values ) )
                 {
-                    var odata = httpContext.Features.Get<IODataVersioningFeature>();
+                    var odata = httpContext.ODataVersioningFeature();
                     var model = new ApiVersionModel( odata.MatchingRoutes.Keys, Array.Empty<ApiVersion>() );
                     var selector = httpContext.RequestServices.GetRequiredService<IApiVersionSelector>();
                     var requestedApiVersion = feature.RequestedApiVersion = selector.SelectVersion( httpContext.Request, model );
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/Microsoft.AspNetCore.OData.Versioning.csproj b/src/Microsoft.AspNetCore.OData.Versioning/Microsoft.AspNetCore.OData.Versioning.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>3.2.2</VersionPrefix>
+  <VersionPrefix>3.2.3</VersionPrefix>
   <AssemblyVersion>3.2.0.0</AssemblyVersion>
   <TargetFramework>netstandard2.0</TargetFramework>
   <AssemblyTitle>Microsoft ASP.NET Core API Versioning for OData v4.0</AssemblyTitle>
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/ReleaseNotes.txt b/src/Microsoft.AspNetCore.OData.Versioning/ReleaseNotes.txt
@@ -1 +1 @@
-﻿Fix key as segment route template generation (#526)
+﻿Fix NRE in unversioned route constraint (#531)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public bool Match( HttpContext httpContext, IRouter route, string routeKey, Rout`
`50`	`50`	`// is implicitly matching an api version allowed?`
`51`	`51`	`if ( options.AssumeDefaultVersionWhenUnspecified \|\| IsServiceDocumentOrMetadataRoute( values ) )`
`52`	`52`	`{`
`53`		`- var odata = httpContext.Features.Get<IODataVersioningFeature>();`
	`53`	`+ var odata = httpContext.ODataVersioningFeature();`
`54`	`54`	`var model = new ApiVersionModel( odata.MatchingRoutes.Keys, Array.Empty<ApiVersion>() );`
`55`	`55`	`var selector = httpContext.RequestServices.GetRequiredService<IApiVersionSelector>();`
`56`	`56`	`var requestedApiVersion = feature.RequestedApiVersion = selector.SelectVersion( httpContext.Request, model );`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Fix key as segment route template generation (#526)`
	`1`	`+Fix NRE in unversioned route constraint (#531)`