svn commit: r1304037 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

[markt]

Author: markt
Date: Thu Mar 22 20:32:41 2012
New Revision: 1304037

URL: http://svn.apache.org/viewvc?rev=1304037&view=rev
Log:
Observed strange NPE while running tests. This isn't much more than a guess at 
what might have caused it.

Modified:
    
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1304037&r1=1304036&r2=1304037&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 Thu Mar 22 20:32:41 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