Author: markt
Date: Thu Jul 22 10:43:43 2010
New Revision: 966570
URL: http://svn.apache.org/viewvc?rev=966570&view=rev
Log:
Fix possible NPE
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=966570&r1=966569&r2=966570&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Jul 22
10:43:43 2010
@@ -317,7 +317,9 @@ public class StandardEngine extends Cont
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
