Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix double registration of Filter

Browse Source 
A stupid typo lurking in EmbeddedWebApplicationContext meant
that a FilterRegistrationBean would register a Filter, and then
it would be registered again without the initializer.

[Fixes #54676948] Filter registered twice
This commit is contained in:
Dave Syer 2013-08-06 11:58:19 +01:00
parent 2ec953a2e8
commit 65bd9dac85
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
View File

@ -241,7 +241,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
for (Entry<String, Filter> filterBean : getOrderedBeansOfType(Filter.class)) {
String name = filterBean.getKey();
Filter filter = filterBean.getValue();
if (!servletRegistrations.contains(filter)) {
if (!filterRegistrations.contains(filter)) {
FilterRegistrationBean registration = new FilterRegistrationBean(filter);
registration.setName(name);
initializers.add(registration);

14
spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
View File

@ -317,6 +317,20 @@ public class EmbeddedWebApplicationContextTests {
verify(servletContext, atMost(1)).addFilter(anyString(), (Filter) anyObject());
}
@Test
public void filterReegistrationBeansSkipsRegisteredFilters() throws Exception {
addEmbeddedServletContainerFactoryBean();
Filter filter = mock(Filter.class);
FilterRegistrationBean initializer = new FilterRegistrationBean(filter);
this.context.registerBeanDefinition("initializerBean",
beanDefinition(initializer));
this.context.registerBeanDefinition("filterBean", beanDefinition(filter));
this.context.refresh();
ServletContext servletContext = getEmbeddedServletContainerFactory()
.getServletContext();
verify(servletContext, atMost(1)).addFilter(anyString(), (Filter) anyObject());
}
@Test
public void postProcessEmbeddedServletContainerFactory() throws Exception {
RootBeanDefinition bd = new RootBeanDefinition(

1
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -38,6 +38,7 @@ import static org.mockito.Mockito.mock;
* {@link TomcatEmbeddedServletContainer}.
*
* @author Phillip Webb
* @author Dave Syer
*/
public class TomcatEmbeddedServletContainerFactoryTests extends
AbstractEmbeddedServletContainerFactoryTests {