build fix

Trofimov Ivan Andreevich · Trofimov Ivan Andreevich · commit 1b5e6a49d22b · 2018-08-08T15:50:57.000+03:00
diff --git a/src/System.Web.Http.Cors/CorsMessageHandler.cs b/src/System.Web.Http.Cors/CorsMessageHandler.cs
@@ -47,21 +47,25 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             CorsRequestContext corsRequestContext = request.GetCorsRequestContext();
             if (corsRequestContext != null)
             {
-                CorsPolicy corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);
+                CorsPolicy corsPolicy = null;
                 try
                 {
+                    HttpResponseMessage responseMessage;
                     if (corsRequestContext.IsPreflight)
                     {
-                        return await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);
+                        responseMessage = await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);
                     }
                     else
                     {
-                        return await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);
+                        responseMessage = await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);
                     }
+
+                    corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);
+                    return responseMessage;
                 }
                 catch (Exception exception)
                 {
-                    if (corsPolicy.RethrowExceptions)
+                    if (corsPolicy != null && corsPolicy.RethrowExceptions)
                         throw;
 
                     return HandleException(request, exception);

Original file line number	Diff line number	Diff line change
`@@ -47,21 +47,25 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage`
`47`	`47`	`CorsRequestContext corsRequestContext = request.GetCorsRequestContext();`
`48`	`48`	`if (corsRequestContext != null)`
`49`	`49`	`{`
`50`		`- CorsPolicy corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);`
	`50`	`+ CorsPolicy corsPolicy = null;`
`51`	`51`	`try`
`52`	`52`	`{`
	`53`	`+ HttpResponseMessage responseMessage;`
`53`	`54`	`if (corsRequestContext.IsPreflight)`
`54`	`55`	`{`
`55`		`- return await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);`
	`56`	`+ responseMessage = await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);`
`56`	`57`	`}`
`57`	`58`	`else`
`58`	`59`	`{`
`59`		`- return await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);`
	`60`	`+ responseMessage = await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);`
`60`	`61`	`}`
	`62`	`+`
	`63`	`+ corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);`
	`64`	`+ return responseMessage;`
`61`	`65`	`}`
`62`	`66`	`catch (Exception exception)`
`63`	`67`	`{`
`64`		`- if (corsPolicy.RethrowExceptions)`
	`68`	`+ if (corsPolicy != null && corsPolicy.RethrowExceptions)`
`65`	`69`	`throw;`
`66`	`70`
`67`	`71`	`return HandleException(request, exception);`