Author: kkolinko
Date: Tue Jul 8 04:02:41 2014
New Revision: 1608653
URL: http://svn.apache.org/r1608653
Log:
Replace field with a getter, to allow to change implementation
(in view of possible backport of r1606651, r1606680)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1608653&r1=1608652&r2=1608653&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Tue Jul 8 04:02:41 2014
@@ -93,7 +93,7 @@ public final class Mapper {
} else {
Host duplicate = hosts[find(hosts, name)];
log.error(sm.getString("mapper.duplicateHost", name,
- duplicate.realHostName));
+ duplicate.getRealHostName()));
// Do not add aliases, as removeHost(hostName) won't be able to
remove them
return;
}
@@ -160,7 +160,7 @@ public final class Mapper {
return;
}
log.error(sm.getString("mapper.duplicateHostAlias", alias,
- realHost.realHostName, duplicate.realHostName));
+ realHost.getRealHostName(), duplicate.getRealHostName()));
}
}
@@ -1468,7 +1468,7 @@ public final class Mapper {
protected static final class Host
extends MapElement {
- public final String realHostName;
+ private final String realHostName;
public ContextList contextList;
/**
@@ -1492,6 +1492,10 @@ public final class Mapper {
public boolean isAlias() {
return !name.equals(realHostName);
}
+
+ public String getRealHostName() {
+ return realHostName;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
