Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-10-26 11:43:46 +02:00
parent e68bf010da
commit 3fee8cb625
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 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.
@@ -96,7 +96,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
*/ */
protected String toAbsolutePath(String path, ServerWebExchange exchange) { protected String toAbsolutePath(String path, ServerWebExchange exchange) {
String requestPath = exchange.getRequest().getURI().getPath(); String requestPath = exchange.getRequest().getURI().getPath();
String absolutePath = path.startsWith("/") ? path : StringUtils.applyRelativePath(requestPath, path); String absolutePath = (path.startsWith("/") ? path : StringUtils.applyRelativePath(requestPath, path));
return StringUtils.cleanPath(absolutePath); return StringUtils.cleanPath(absolutePath);
} }

4
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 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.
@@ -95,7 +95,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
*/ */
protected String toAbsolutePath(String path, HttpServletRequest request) { protected String toAbsolutePath(String path, HttpServletRequest request) {
String absolutePath = path; String absolutePath = path;
if(!path.startsWith("/")) { if (!path.startsWith("/")) {
ResourceUrlProvider urlProvider = findResourceUrlProvider(request); ResourceUrlProvider urlProvider = findResourceUrlProvider(request);
Assert.state(urlProvider != null, "No ResourceUrlProvider"); Assert.state(urlProvider != null, "No ResourceUrlProvider");
String requestPath = urlProvider.getUrlPathHelper().getRequestUri(request); String requestPath = urlProvider.getUrlPathHelper().getRequestUri(request);