tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1221474 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/mapper/Mapper.java webapps/docs/changelog.xml
Date Tue, 20 Dec 2011 20:19:40 GMT
Author: markt
Date: Tue Dec 20 20:19:39 2011
New Revision: 1221474

URL: http://svn.apache.org/viewvc?rev=1221474&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225
Fix ClassCastException in Alias added for existing host via JMX


Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1221474&r1=1221473&r2=1221474&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 20 20:19:39 2011
@@ -110,13 +110,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko,funkman
   -1:
 
-* 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
-  -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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1221474&r1=1221473&r2=1221474&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Tue Dec 20 20:19:39
2011
@@ -154,7 +154,7 @@ public final class Mapper {
         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;
         }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1221474&r1=1221473&r2=1221474&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Dec 20 20:19:39 2011
@@ -44,6 +44,14 @@
  General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
 -->
 <section name="Tomcat 6.0.36 (jfclere)" 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="Other">
     <changelog>
       <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message