Explorar o código

Optimize AntPathRequestMatcher.getRequestPath()

Christoph Dreis %!s(int64=7) %!d(string=hai) anos
pai
achega
4ccd2f7ebd

+ 4 - 3
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");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with 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) {
 	private String getRequestPath(HttpServletRequest request) {
 		String url = request.getServletPath();
 		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;
 		return url;