Author: remm
Date: Thu Jun 26 12:40:25 2014
New Revision: 1605765
URL: http://svn.apache.org/r1605765
Log:
Skip domain property instead.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1605765&r1=1605764&r2=1605765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Thu
Jun 26 12:40:25 2014
@@ -259,6 +259,7 @@
<TransientAttribute>cacheObjectMaxSize</TransientAttribute>
<TransientAttribute>cached</TransientAttribute>
<TransientAttribute>caseSensitive</TransientAttribute>
+ <TransientAttribute>domain</TransientAttribute>
</Description>
<Description
id="org.apache.catalina.WebResourceSet.[PreResources]"
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=1605765&r1=1605764&r2=1605765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Jun 26 12:40:25 2014
@@ -592,7 +592,7 @@ public class StandardRoot extends Lifecy
// ----------------------------------------------------------- JMX
Lifecycle
@Override
protected String getDomainInternal() {
- return (context != null) ? context.getDomain() : null;
+ return context.getDomain();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
