From 45be761911410986bc03de43363cad606351c0ea Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 8 Jun 2011 13:52:50 +0000 Subject: [PATCH] Avoid possible NPE git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1133401 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/CoyoteAdapter.java | 7 ++++++- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index e691eca98..7fef9b969 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -26,6 +26,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.SessionTrackingMode; import org.apache.catalina.Context; +import org.apache.catalina.Host; import org.apache.catalina.Wrapper; import org.apache.catalina.comet.CometEvent; import org.apache.catalina.comet.CometEvent.EventType; @@ -642,7 +643,11 @@ public class CoyoteAdapter implements Adapter { res.setStatus(404); res.setMessage("Not found"); // No context, so use host - request.getHost().logAccess(request, response, 0, true); + Host host = request.getHost(); + // Make sure there is a host (might not be during shutdown) + if (host != null) { + host.logAccess(request, response, 0, true); + } return false; } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 39db3c899..34374e6a6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -67,6 +67,10 @@ Enable remaining valves for Servlet 3 asynchronous processing support. (markt) + + Avoid possible NPE when logging requests received during embedded Tomcat + shutdown. (markt) + -- 2.11.0