root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix missing ResourceHttpRequestHandler init in registry 

Issue: SPR-14577
This commit is contained in:
Brian Clozel 2016-08-31 10:43:11 +02:00
parent ab9fea6b8d
commit 7a88776329
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
View File

@ -142,6 +142,7 @@ public class ResourceHandlerRegistry {
handler.setContentNegotiationManager(this.contentNegotiationManager); handler.setContentNegotiationManager(this.contentNegotiationManager);
try { try {
handler.afterPropertiesSet(); handler.afterPropertiesSet();
handler.afterSingletonsInstantiated();
} }
catch (Exception ex) { catch (Exception ex) {
throw new BeanInitializationException("Failed to init ResourceHttpRequestHandler", ex); throw new BeanInitializationException("Failed to init ResourceHttpRequestHandler", ex);

4
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 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.
@ -79,8 +79,6 @@ public class ResourceHandlerRegistryTests {
request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/testStylesheet.css"); request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/testStylesheet.css");
ResourceHttpRequestHandler handler = getHandler("/resources/**"); ResourceHttpRequestHandler handler = getHandler("/resources/**");
handler.afterPropertiesSet();
handler.afterSingletonsInstantiated();
handler.handleRequest(request, this.response); handler.handleRequest(request, this.response);
assertEquals("test stylesheet content", this.response.getContentAsString()); assertEquals("test stylesheet content", this.response.getContentAsString());