From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 22 Jul 2010 10:43:43 +0000 (+0000)
Subject: Fix possible NPE
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4f97d9b23abf523c660ea5961f2b8be5b2a33ccc;p=tomcat7.0

Fix possible NPE

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

diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java
index e2a960ab7..a463f449c 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -317,7 +317,9 @@ public class StandardEngine extends ContainerBase implements Engine {
                 if (defaultAccessLog == null) {
                     // Try the ROOT context of default host
                     Context context = (Context) host.findChild("");
-                    defaultAccessLog = context.getAccessLog();
+                    if (context != null) {
+                        defaultAccessLog = context.getAccessLog();
+                    }
 
                     if (defaultAccessLog == null) {
                         defaultAccessLog = new NoopAccessLog();