Browse Source

Polishing

pull/2001/head
Juergen Hoeller 7 years ago
parent
commit
3fee8cb625
  1. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
  2. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -96,7 +96,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer @@ -96,7 +96,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
*/
protected String toAbsolutePath(String path, ServerWebExchange exchange) {
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);
}

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -95,7 +95,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer @@ -95,7 +95,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
*/
protected String toAbsolutePath(String path, HttpServletRequest request) {
String absolutePath = path;
if(!path.startsWith("/")) {
if (!path.startsWith("/")) {
ResourceUrlProvider urlProvider = findResourceUrlProvider(request);
Assert.state(urlProvider != null, "No ResourceUrlProvider");
String requestPath = urlProvider.getUrlPathHelper().getRequestUri(request);

Loading…
Cancel
Save