Author: remm
Date: Thu Jun 26 10:16:59 2014
New Revision: 1605723
URL: http://svn.apache.org/r1605723
Log:
Avoid NPE with storeconfig.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1605723&r1=1605722&r2=1605723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Jun 26 10:16:59 2014
@@ -592,7 +592,7 @@ public class StandardRoot extends Lifecy
// ----------------------------------------------------------- JMX
Lifecycle
@Override
protected String getDomainInternal() {
- return context.getDomain();
+ return (context != null) ? context.getDomain() : null;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
