Author: remm
Date: Thu Jul 2 16:13:38 2015
New Revision: 1688854
URL: http://svn.apache.org/r1688854
Log:
58094: Fix error log when attempting to register a non existing resource cache
for non cached resources (unregistration doesn't log anything).
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1688854&r1=1688853&r2=1688854&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Jul 2 16:13:38 2015
@@ -5168,7 +5168,7 @@ public class StandardContext extends Con
}
}
// Register the cache in JMX
- if (isCachingAllowed()) {
+ if (isCachingAllowed() && proxyDirContext.getCache() != null) {
String contextName = getName();
if (!contextName.startsWith("/")) {
contextName = "/" + contextName;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1688854&r1=1688853&r2=1688854&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jul 2 16:13:38 2015
@@ -65,6 +65,11 @@
ANT for web application deployment. Based on a patch provided by Lukasz
Jader. (violetagg)
</fix>
+ <fix>
+ <bug>58094</bug>: Fix cosmetic error log when using non standard
+ non cacheable resources, like with the empty resources used in some
+ tests. (remm)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
