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

Avoid exposing spring.resources.favicon-locations as a property

Browse Source 
Closes gh-9214
This commit is contained in:
Stephane Nicoll
2017-05-12 17:25:35 +02:00
parent d7ba7ecc48
commit cf88508e1d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@@ -117,7 +117,7 @@ public class ResourceProperties implements ResourceLoaderAware {
return result;
}
public List<Resource> getFaviconLocations() {
public List<Resource> resolveFaviconLocations() {
List<Resource> locations = new ArrayList<>(this.staticLocations.length + 1);
if (this.resourceLoader != null) {
for (String location : this.staticLocations) {

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
View File

@@ -351,7 +351,7 @@ public class WebMvcAutoConfiguration {
public ResourceHttpRequestHandler faviconRequestHandler() {
ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler();
requestHandler
.setLocations(this.resourceProperties.getFaviconLocations());
.setLocations(this.resourceProperties.resolveFaviconLocations());
return requestHandler;
}