Author: remm
Date: Wed Jan 24 15:19:25 2018
New Revision: 1822111
URL: http://svn.apache.org/viewvc?rev=1822111&view=rev
Log:
Avoid NPE if there is no Engine.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java?rev=1822111&r1=1822110&r2=1822111&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
Wed Jan 24 15:19:25 2018
@@ -128,8 +128,10 @@ public class ThreadLocalLeakPreventionLi
private void registerListenersForServer(Server server) {
for (Service service : server.findServices()) {
Engine engine = service.getContainer();
- engine.addContainerListener(this);
- registerListenersForEngine(engine);
+ if (engine != null) {
+ engine.addContainerListener(this);
+ registerListenersForEngine(engine);
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822111&r1=1822110&r2=1822111&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 24 15:19:25 2018
@@ -54,6 +54,10 @@
<fix>
Avoid duplicate load attempts if one has been made already. (remm)
</fix>
+ <fix>
+ Avoid NPE in ThreadLocalLeakPreventionListener if there is no Engine.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
