Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225
Fix ClassCastException in Alias added for existing host via JMX
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1221471 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS.txt b/STATUS.txt
index a933fd6..7b1c88d 100644
--- a/STATUS.txt
+++ b/STATUS.txt
@@ -24,13 +24,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225
- Fix ClassCastException in Alias added for existing host via JMX
- http://svn.apache.org/viewvc?rev=1204856&view=rev
- (without tests; it is r1204860 in TC7)
- +1: kkolinko, markt, funkman, jim
- -1:
-
* Do not throw IllegalArgumentException from parseParameters() call when
chunked POST request is too large, but treat it like an IO error.
http://svn.apache.org/viewvc?rev=1206200&view=rev
diff --git a/connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java b/connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
index 0974078..4c5cde6 100644
--- a/connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
+++ b/connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
@@ -154,7 +154,7 @@
Host newHost = new Host();
newHost.name = alias;
newHost.contextList = realHost.contextList;
- newHost.object = realHost;
+ newHost.object = realHost.object;
if (insertMap(hosts, newHosts, newHost)) {
hosts = newHosts;
}
diff --git a/container/webapps/docs/changelog.xml b/container/webapps/docs/changelog.xml
index e10677c..aefb483 100644
--- a/container/webapps/docs/changelog.xml
+++ b/container/webapps/docs/changelog.xml
@@ -40,6 +40,14 @@
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 5.5.35 (jim)" rtext="">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>52225</bug>: Fix ClassCastException when adding an alias for an
+ existing host via JMX. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="General">
<changelog>
<update>
