Author: markt
Date: Mon Feb 8 13:27:45 2010
New Revision: 907651
URL: http://svn.apache.org/viewvc?rev=907651&view=rev
Log:
Protect against NPE whilst running the test
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=907651&r1=907650&r2=907651&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Mon Feb 8 13:27:45 2010
@@ -36,7 +36,8 @@
// If the thread still exists, we have a thread/memory leak
Thread[] threads = getThreads();
for (Thread thread : threads) {
- if (thread.getName().equals(TaskServlet.TIMER_THREAD_NAME)) {
+ if (thread != null &&
+ TaskServlet.TIMER_THREAD_NAME.equals(thread.getName())) {
fail("Timer thread still running");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
