Author: kkolinko
Date: Mon Jun 23 17:20:38 2014
New Revision: 1604885
URL: http://svn.apache.org/r1604885
Log:
Correct comment to cover duplicate "Alias"es case. Amend testcase.
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
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=1604885&r1=1604884&r2=1604885&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Mon Jun 23
17:20:38 2014
@@ -156,7 +156,7 @@ public final class Mapper {
} else {
HostMapping duplicate = hosts[find(hosts, alias)];
if (duplicate.object == mappedHost) {
- // An Alias with the same name as its own Host.
+ // A duplicate Alias for the same Host.
// A harmless redundancy. E.g.
// <Host name="localhost"><Alias>localhost</Alias></Host>
return;
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java?rev=1604885&r1=1604884&r2=1604885&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java Mon Jun 23
17:20:38 2014
@@ -129,6 +129,9 @@ public class TestMapper extends LoggingB
mapper.addHostAlias("iowejoiejfoiew", "qwigqwiwoih");
// Redundancy. Alias name = Host name. No error here.
mapper.addHostAlias("qwigqwiwoih", "qwigqwiwoih");
+ // Redundancy. Duplicate Alias for the same Host name. No error here.
+ mapper.addHostAlias("iowejoiejfoiew", "iowejoiejfoiew_alias");
+ mapper.addHostAlias("iowejoiejfoiew", "iowejoiejfoiew_alias");
// Check we have the right number
// (added 16 including one host alias. Three duplicates do not
increase the count.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
