Author: markt
Date: Tue Oct 7 09:06:35 2014
New Revision: 1629833
URL: http://svn.apache.org/r1629833
Log:
The result of this method is used in logging to identify the context but
Context.getName() is not unique with a Host. Context.getBaseName() is unique
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1629833&r1=1629832&r2=1629833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue
Oct 7 09:06:35 2014
@@ -457,7 +457,7 @@ public abstract class WebappClassLoaderB
if (resources == null) {
return "Unknown";
} else {
- return resources.getContext().getName();
+ return resources.getContext().getBaseName();
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1629833&r1=1629832&r2=1629833&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 7 09:06:35 2014
@@ -119,6 +119,11 @@
Correctly handle relative values for the docBase attribute of a
Context.
(markt)
</fix>
+ <fix>
+ Ensure that log messages generated by the web application class loader
+ correctly identify the associated Context when multiple versions of a
+ Context with the same path are present. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
