Author: kkolinko
Date: Tue Jul 8 15:07:45 2014
New Revision: 1608824
URL: http://svn.apache.org/r1608824
Log:
Improve the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44312
Check that addWrapper/removeWrapper, add/clear/removeWelcomeFile[s] are
performed on the real Host, as expected by the caller.
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1608824&r1=1608823&r2=1608824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Tue Jul 8
15:07:45 2014
@@ -331,7 +331,7 @@ public final class Mapper {
private ContextVersion findContextVersion(String hostName,
String contextPath, String version, boolean silent) {
MappedHost host = exactFind(hosts, hostName);
- if (host == null) {
+ if (host == null || host.isAlias()) {
if (!silent) {
log.error("No host found: " + hostName);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1608824&r1=1608823&r2=1608824&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 8 15:07:45 2014
@@ -50,7 +50,8 @@
<fix>
<bug>44312</bug>: Log an error if there is a conflict between Host and
Alias names. Improve host management methods in <code>Mapper</code>
- to avoid occasionally removing a wrong host. (kkolinko)
+ to avoid occasionally removing a wrong host. Check that host management
+ operations are performed on the host and not on an alias. (kkolinko)
</fix>
<scode>
<bug>56611</bug>: Refactor code to remove inefficient calls to
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
