Fix BZ 42459: Manager webap table format error

for stopped and undeployed webapps.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@539895 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 9bfbd92..9915c08 100644 (file)
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -1006,7 +1006,7 @@ public final class HTMLManagerServlet extends ManagerServlet {
         "  &nbsp;<a href=\"{6}\" onclick=\"return(confirm('''Are you sure?  This will delete the application.'''))\">{7}</a>&nbsp;\n" +
         "  </small>\n" +
         " </td>\n" +
-        "</tr>\n";
+        "</tr>\n<tr></tr>\n";
 
     private static final String STARTED_NONDEPLOYED_APPS_ROW_BUTTON_SECTION =
         " <td class=\"row-left\" bgcolor=\"{13}\" rowspan=\"2\">\n" +
@@ -1017,7 +1017,7 @@ public final class HTMLManagerServlet extends ManagerServlet {
         "  &nbsp;{7}&nbsp;\n" +
         "  </small>\n" +
         " </td>\n" +
-        "</tr>\n";
+        "</tr>\n<tr></tr>\n";
 
     private static final String STOPPED_NONDEPLOYED_APPS_ROW_BUTTON_SECTION =
         " <td class=\"row-left\" bgcolor=\"{13}\" rowspan=\"2\">\n" +
@@ -1028,7 +1028,7 @@ public final class HTMLManagerServlet extends ManagerServlet {
         "  &nbsp;{7}&nbsp;\n" +
         "  </small>\n" +
         " </td>\n" +
-        "</tr>\n";
+        "</tr>\n<tr></tr>\n";
 
     private static final String DEPLOY_SECTION =
         "</table>\n" +

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dcf8dec..81a749b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -31,6 +31,13 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Webapps">
+    <changelog>
+      <fix>
+         <bug>42459</bug>: Tomcat Web Application Manager table error (rjung)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.13 (remm)">
   <subsection name="Catalina">