Author: markt
Date: Fri Apr 22 13:22:37 2016
New Revision: 1740521
URL: http://svn.apache.org/viewvc?rev=1740521&view=rev
Log:
Expand checks for proper WebSocket shutdown
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 13:22:37 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java
Fri Apr 22 13:22:37 2016
@@ -108,6 +108,17 @@ public class BackgroundProcessManager {
}
+ void shutdown() {
+ synchronized (processesLock) {
+ processes.clear();
+ if (wsBackgroundThread != null) {
+ wsBackgroundThread.halt();
+ wsBackgroundThread = null;
+ }
+ }
+ }
+
+
private static class WsBackgroundThread extends Thread {
private final BackgroundProcessManager manager;
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Fri Apr 22 13:22:37 2016
@@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest
}
Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
+
+ // Ensure the next test is not affected
+ BackgroundProcessManager.getInstance().shutdown();
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
Fri Apr 22 13:22:37 2016
@@ -35,12 +35,12 @@ import org.apache.catalina.Context;
import org.apache.catalina.loader.WebappClassLoaderBase;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
* Tests endpoint methods are called with the correct class loader.
*/
-public class TestClassLoader extends TomcatBaseTest {
+public class TestClassLoader extends WebSocketBaseTest {
private static final String PASS = "PASS";
private static final String FAIL = "FAIL";
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Fri Apr 22 13:22:37 2016
@@ -42,14 +42,14 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
* Test the behavior of closing websockets under various conditions.
*/
-public class TestClose extends TomcatBaseTest {
+public class TestClose extends WebSocketBaseTest {
private static Log log = LogFactory.getLog(TestClose.class);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java
Fri Apr 22 13:22:37 2016
@@ -37,9 +37,9 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
-public class TestCloseBug58264 extends TomcatBaseTest {
+public class TestCloseBug58264 extends WebSocketBaseTest {
@Test
public void testOnErrorNotCalledWhenClosingConnection() throws Throwable {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
Fri Apr 22 13:22:37 2016
@@ -37,15 +37,15 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
* Tests inspired by https://bz.apache.org/bugzilla/show_bug.cgi?id=58835 to
* check that WebSocket connections are closed gracefully on Tomcat shutdown.
*/
-public class TestShutdown extends TomcatBaseTest {
+public class TestShutdown extends WebSocketBaseTest {
@Test
public void testShutdownBufferedMessages() throws Exception {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Fri Apr 22 13:22:37 2016
@@ -42,11 +42,11 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
@Ignore // This test requires manual intervention to create breakpoints etc.
-public class TestWsRemoteEndpointImplServer extends TomcatBaseTest {
+public class TestWsRemoteEndpointImplServer extends WebSocketBaseTest {
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1740521&r1=1740520&r2=1740521&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Fri Apr 22 13:22:37 2016
@@ -33,14 +33,14 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterServletContext;
import org.apache.tomcat.websocket.TesterEchoServer;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
+import org.apache.tomcat.websocket.WebSocketBaseTest;
import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
-public class TestWsServerContainer extends TomcatBaseTest {
+public class TestWsServerContainer extends WebSocketBaseTest {
@Test
public void testBug54807() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
