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

Do not register shutdownHook for WAR deployments 

The application context shutdownHook is not needed for WAR deployments,
and we should let the Servlet container handle the application lifecycle
here.

Closes gh-19398
This commit is contained in:
Brian Clozel 2020-03-24 23:11:18 +01:00
parent 87de8a5e15
commit 9eed719c44
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -131,6 +131,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
if (this.registerErrorPageFilter) { if (this.registerErrorPageFilter) {
application.addPrimarySources(Collections.singleton(ErrorPageFilterConfiguration.class)); application.addPrimarySources(Collections.singleton(ErrorPageFilterConfiguration.class));
} }
application.setRegisterShutdownHook(false);
return run(application); return run(application);
} }

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -100,6 +100,12 @@ class SpringBootServletInitializerTests {
WithConfigurationAnnotation.class); WithConfigurationAnnotation.class);
} }
@Test
void shutdownHookIsNotRegistered() {
new WithConfigurationAnnotation().createRootApplicationContext(this.servletContext);
assertThat(this.application).hasFieldOrPropertyWithValue("registerShutdownHook", false);
}
@Test @Test
void errorPageFilterRegistrationCanBeDisabled() { void errorPageFilterRegistrationCanBeDisabled() {
WebServer webServer = new UndertowServletWebServerFactory(0).getWebServer((servletContext) -> { WebServer webServer = new UndertowServletWebServerFactory(0).getWebServer((servletContext) -> {