From 8c727be4e1089f9e8dcdae9a201289c98c5762f1 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 28 Oct 2014 17:49:06 -0400 Subject: [PATCH] Close Spring context in SockJS integration test setup --- .../web/socket/JettyWebSocketTestServer.java | 2 +- .../sockjs/client/AbstractSockJsIntegrationTests.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java index 5641a8c77b..4f83b57662 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java @@ -82,7 +82,7 @@ public class JettyWebSocketTestServer implements WebSocketTestServer { @Override public void stop() throws Exception { if (this.jettyServer.isRunning()) { - this.jettyServer.setStopTimeout(0); + this.jettyServer.setStopTimeout(5000); this.jettyServer.stop(); } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java index 3846578355..1c19aa844c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java @@ -122,6 +122,12 @@ public abstract class AbstractSockJsIntegrationTests { catch (Throwable t) { logger.error("Failed to stop server", t); } + try { + this.wac.close(); + } + catch (Throwable t) { + logger.error("Failed to close WebApplicationContext", t); + } } protected abstract Class upgradeStrategyConfigClass();