svn commit: r1496443 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsServerContainer.java test/org/apache/tomcat/websocket/server/TestWsServerContainer.java

[markt]

Author: markt
Date: Tue Jun 25 12:17:03 2013
New Revision: 1496443

URL: http://svn.apache.org/r1496443
Log:
Fix failing tests

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
    
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1496443&r1=1496442&r2=1496443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
Tue Jun 25 12:17:03 2013
@@ -77,6 +77,13 @@ public class WsServerContainer extends W
         return result;
     }
 
+    // For unit testing
+    protected static void recycle() {
+        synchronized (classLoaderContainerMapLock) {
+            classLoaderContainerMap.clear();
+        }
+    }
+
     private final WsWriteTimeout wsWriteTimeout = new WsWriteTimeout();
 
     private volatile ServletContext servletContext = null;

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1496443&r1=1496442&r2=1496443&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java 
Tue Jun 25 12:17:03 2013
@@ -77,6 +77,7 @@ public class TestWsServerContainer exten
 
     @Test
     public void testSpecExample3() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 
@@ -99,6 +100,7 @@ public class TestWsServerContainer exten
 
     @Test
     public void testSpecExample4() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 
@@ -116,6 +118,7 @@ public class TestWsServerContainer exten
 
     @Test(expected = javax.websocket.DeploymentException.class)
     public void testDuplicatePaths_01() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 
@@ -131,6 +134,7 @@ public class TestWsServerContainer exten
 
     @Test(expected = javax.websocket.DeploymentException.class)
     public void testDuplicatePaths_02() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 
@@ -146,6 +150,7 @@ public class TestWsServerContainer exten
 
     @Test(expected = javax.websocket.DeploymentException.class)
     public void testDuplicatePaths_03() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 
@@ -161,6 +166,7 @@ public class TestWsServerContainer exten
 
     @Test
     public void testDuplicatePaths_04() throws Exception {
+        WsServerContainer.recycle();
         WsServerContainer sc = WsServerContainer.getServerContainer();
         sc.setServletContext(new TesterServletContext());
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org