svn commit: r1304038 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

[markt]

Author: markt
Date: Thu Mar 22 20:33:22 2012
New Revision: 1304038

URL: http://svn.apache.org/viewvc?rev=1304038&view=rev
Log:
Only try to stop children that are currently started. Prevents error messages 
appearing in logs.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1304035

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1304038&r1=1304037&r2=1304038&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Thu 
Mar 22 20:33:22 2012
@@ -1578,7 +1578,9 @@ public abstract class ContainerBase exte
 
         @Override
         public Void call() throws LifecycleException {
-            child.stop();
+            if (child.getState().isAvailable()) {
+                child.stop();
+            }
             return null;
         }
     }

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1304038&r1=1304037&r2=1304038&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 Thu Mar 22 20:33:22 2012
@@ -49,7 +49,8 @@ public class TestWebappClassLoaderExecut
             ((StandardContext) ctx).setClearReferencesStopThreads(true);
         }
 
-        Tomcat.addServlet(ctx, "taskServlet", new ExecutorServlet());
+        ExecutorServlet executorServlet = new ExecutorServlet();
+        Tomcat.addServlet(ctx, "taskServlet", executorServlet);
         ctx.addServletMapping("/", "taskServlet");
 
         tomcat.start();
@@ -67,8 +68,8 @@ public class TestWebappClassLoaderExecut
             // ignore
         }
 
-        Assert.assertTrue(ExecutorServlet.tpe.isShutdown());
-        Assert.assertTrue(ExecutorServlet.tpe.isTerminated());
+        Assert.assertTrue(executorServlet.tpe.isShutdown());
+        Assert.assertTrue(executorServlet.tpe.isTerminated());
     }
 
     static class ExecutorServlet extends HttpServlet {
@@ -79,7 +80,7 @@ public class TestWebappClassLoaderExecut
         long n = 1000L;
         int tpSize = 10;
 
-        public static ThreadPoolExecutor tpe;
+        public volatile ThreadPoolExecutor tpe;
 
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)



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