From ac6a86fb5f11e70efcc6d9aa837646ea886d5aa2 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Thu, 1 Jun 2017 14:25:24 -0500
Subject: [PATCH] Fixes for changes in SPR-15397

---
 .../util/matcher/PathMatcherServerWebExchangeMatcher.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webflux/src/main/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcher.java b/webflux/src/main/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcher.java
index e8ce40a169..d07e99c577 100644
--- a/webflux/src/main/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcher.java
+++ b/webflux/src/main/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcher.java
@@ -27,6 +27,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.support.HttpRequestPathHelper;
+import org.springframework.web.server.support.LookupPath;
 import reactor.core.publisher.Mono;
 
 /**
@@ -57,7 +58,8 @@ public final class PathMatcherServerWebExchangeMatcher implements ServerWebExcha
 		if(this.method != null && !this.method.equals(request.getMethod())) {
 			return MatchResult.notMatch();
 		}
-		String path = helper.getLookupPathForRequest(exchange);
+		LookupPath lookupPath = helper.getLookupPathForRequest(exchange);
+		String path = lookupPath.getPath();
 		boolean match = pathMatcher.match(pattern, path);
 		if(!match) {
 			return MatchResult.notMatch();