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

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Phillip Webb
2014-09-17 10:46:30 -07:00
parent d441e7af93 611f978181
commit 88f8eb7fa4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@@ -96,7 +96,7 @@ public class ThymeleafAutoConfiguration {
}
@Bean
protected SpringResourceResourceResolver thymeleafResourceResolver() {
public SpringResourceResourceResolver thymeleafResourceResolver() {
return new SpringResourceResourceResolver();
}
}

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

@@ -294,7 +294,7 @@ public class WebMvcAutoConfiguration {
}
@Bean
protected ResourceHttpRequestHandler faviconRequestHandler() {
public ResourceHttpRequestHandler faviconRequestHandler() {
ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler();
requestHandler.setLocations(Arrays
.<Resource> asList(new ClassPathResource("/")));