Author: markt Date: Thu Jan 17 11:38:25 2008 New Revision: 612948 URL: http://svn.apache.org/viewvc?rev=612948&view=rev Log: Fix bug 43515. Bug in listing contexts. Patch provided by Lucas Galfaso.
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.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=612948&r1=612947&r2=612948&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:38:25 2008 @@ -35,8 +35,3 @@ http://svn.apache.org/viewvc?view=rev&revision=612192 +1: fhanik, markt, pero -1: - -* http://issues.apache.org/bugzilla/show_bug.cgi?id=43515 - http://svn.apache.org/viewvc?rev=612636&view=rev - +1: markt, pero, rjung - -1: Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612948&r1=612947&r2=612948&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu Jan 17 11:38:25 2008 @@ -382,7 +382,7 @@ Map.Entry entry = (Map.Entry) iterator.next(); String displayPath = (String) entry.getKey(); - String contextPath = (String) entry.getKey(); + String contextPath = (String) entry.getValue(); Context context = (Context) host.findChild(contextPath); if (displayPath.equals("")) { displayPath = "/"; 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=612948&r1=612947&r2=612948&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:38:25 2008 @@ -230,6 +230,10 @@ application. (markt) </fix> <fix> + <bug>43515</bug>: Fix bug in Manager application that may have caused + problems when listing contexts. Patch provided by Lucas Galfaso. (markt) + </fix> + <fix> <bug>43611</bug>: Provide an error message if user tries to upload a war for a context defined in server.xml rather than failing silently. (markt/jim) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]