Merge branch '1.1.x'

This commit is contained in:
Phillip Webb 2014-09-17 10:46:30 -07:00
commit 88f8eb7fa4
3 changed files with 3 additions and 3 deletions

View File

@ -133,7 +133,7 @@ public class MetricRepositoryAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "metricsExecutor") @ConditionalOnMissingBean(name = "metricsExecutor")
protected Executor metricsExecutor() { public Executor metricsExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
return executor; return executor;
} }

View File

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

View File

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