From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Feb 2010 13:27:45 +0000 (+0000)
Subject: Protect against NPE whilst running the test
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f904a4bb63018caa49b6370b90da7648c245cc5f;p=tomcat7.0

Protect against NPE whilst running the test

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907651 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
index 5534e5644..52882bd68 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
@@ -36,7 +36,8 @@ public class TestWebappClassLoaderMemoryLeak extends TomcatBaseTest {
         // 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");
             }
         }