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

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2018-05-14 20:07:46 +01:00
parent 1ffc8a564a 339fd74810
commit 73e525a280
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java
View File

@ -304,6 +304,7 @@ public class UndertowServletWebServer implements WebServer {
this.started = false;
try {
this.manager.stop();
this.manager.undeploy();
this.undertow.stop();
}
catch (Exception ex) {

13
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -55,6 +55,8 @@ import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@ -1038,6 +1040,17 @@ public abstract class AbstractServletWebServerFactoryTests {
assertThat(servletContext.getSessionCookieConfig().getMaxAge()).isEqualTo(60);
}
@Test
public void servletContextListenerContextDestroyedIsCalledWhenContainerIsStopped()
throws Exception {
ServletContextListener listener = mock(ServletContextListener.class);
this.webServer = getFactory()
.getWebServer((servletContext) -> servletContext.addListener(listener));
this.webServer.start();
this.webServer.stop();
verify(listener).contextDestroyed(any(ServletContextEvent.class));
}
protected abstract void addConnector(int port,
AbstractServletWebServerFactory factory);