From 2d85accb833bb5cd5e7f44c38c29919af82c836b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 27 May 2016 18:24:49 +0200 Subject: [PATCH] SpringTilesContainerFactory uses Tiles 3's createDecoratedContainer Issue: SPR-14311 --- .../web/servlet/view/tiles3/TilesConfigurer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java index 8e77b275b9..919f83d399 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 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. @@ -293,9 +293,8 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D private class SpringTilesContainerFactory extends BasicTilesContainerFactory { @Override - public TilesContainer createContainer(ApplicationContext context) { - TilesContainer container = super.createContainer(context); - return (useMutableTilesContainer ? new CachingTilesContainer(container) : container); + protected TilesContainer createDecoratedContainer(TilesContainer originalContainer, ApplicationContext context) { + return (useMutableTilesContainer ? new CachingTilesContainer(originalContainer) : originalContainer); } @Override