Author: markt
Date: Sat Dec 31 19:05:20 2011
New Revision: 1226177
URL: http://svn.apache.org/viewvc?rev=1226177&view=rev
Log:
Fix possible NPE
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1226177&r1=1226176&r2=1226177&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Sat Dec 31
19:05:20 2011
@@ -668,7 +668,11 @@ public class Tomcat {
private void silence(Host host, String ctx) {
String base = "org.apache.catalina.core.ContainerBase.[default].[";
- base += host.getName();
+ if (host == null) {
+ base += getHost().getName();
+ } else {
+ base += host.getName();
+ }
base += "].[";
base += ctx;
base += "]";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
