From d26421fe3b7c42fb47bc438a22d2514a385252d0 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 31 Aug 2016 10:43:11 +0200 Subject: [PATCH] Fix missing ResourceHttpRequestHandler init in registry Issue: SPR-14577 Cherry-picked from: 7a88776329 --- .../servlet/config/annotation/ResourceHandlerRegistry.java | 1 + .../config/annotation/ResourceHandlerRegistryTests.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java index 81f04456e0d..93853ed5680 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java @@ -142,6 +142,7 @@ public class ResourceHandlerRegistry { handler.setContentNegotiationManager(this.contentNegotiationManager); try { handler.afterPropertiesSet(); + handler.afterSingletonsInstantiated(); } catch (Exception ex) { throw new BeanInitializationException("Failed to init ResourceHttpRequestHandler", ex); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java index 32e2f64366c..83c032fb6ca 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java @@ -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"); * 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"); ResourceHttpRequestHandler handler = getHandler("/resources/**"); - handler.afterPropertiesSet(); - handler.afterSingletonsInstantiated(); handler.handleRequest(request, this.response); assertEquals("test stylesheet content", this.response.getContentAsString());