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 e2a960a..a463f44 100644 (file)
--- 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();