From 4ccd2f7ebd8437431f2d918990c54edcbbba7cc2 Mon Sep 17 00:00:00 2001
From: Christoph Dreis <christoph.dreis@freenet.de>
Date: Mon, 2 Jul 2018 16:22:09 +0200
Subject: [PATCH] Optimize AntPathRequestMatcher.getRequestPath()

---
 .../security/web/util/matcher/AntPathRequestMatcher.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
index e66ef83199..3fc47791f0 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -173,8 +173,9 @@ public final class AntPathRequestMatcher
 	private String getRequestPath(HttpServletRequest request) {
 		String url = request.getServletPath();
 
-		if (request.getPathInfo() != null) {
-			url += request.getPathInfo();
+		String pathInfo = request.getPathInfo();
+		if (pathInfo != null) {
+			url = StringUtils.hasLength(url) ? pathInfo : url + pathInfo;
 		}
 
 		return url;