--- container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java	2011/01/11 08:08:51	1057517
+++ container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java	2011/01/11 08:13:05	1057518
@@ -370,15 +370,16 @@
                 }
                 
                 args = new Object[6];
-                args[0] = displayPath;
-                args[1] = context.getDisplayName();
-                if (args[1] == null) {
+                args[0] = RequestUtil.filter(displayPath);
+                if (context.getDisplayName() == null) {
                     args[1] = " ";
+                } else {
+                    args[1] = RequestUtil.filter(context.getDisplayName());
                 }
                 args[2] = new Boolean(context.getAvailable());
-                args[3] = response.encodeURL
+                args[3] = RequestUtil.filter(response.encodeURL
                     (request.getContextPath() +
-                     "/html/sessions?path=" + displayPath);
+                     "/html/sessions?path=" + displayPath));
                 if (context.getManager() != null) {
                     args[4] = new Integer
                         (context.getManager().getActiveSessions());
@@ -392,21 +393,21 @@
                     (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
 
                 args = new Object[9];
-                args[0] = response.encodeURL
+                args[0] = RequestUtil.filter(response.encodeURL
                     (request.getContextPath() +
-                     "/html/start?path=" + displayPath);
+                     "/html/start?path=" + displayPath));
                 args[1] = appsStart;
-                args[2] = response.encodeURL
+                args[2] = RequestUtil.filter(response.encodeURL
                     (request.getContextPath() +
-                     "/html/stop?path=" + displayPath);
+                     "/html/stop?path=" + displayPath));
                 args[3] = appsStop;
-                args[4] = response.encodeURL
+                args[4] = RequestUtil.filter(response.encodeURL
                     (request.getContextPath() +
-                     "/html/reload?path=" + displayPath);
+                     "/html/reload?path=" + displayPath));
                 args[5] = appsReload;
-                args[6] = response.encodeURL
+                args[6] = RequestUtil.filter(response.encodeURL
                     (request.getContextPath() +
-                     "/html/undeploy?path=" + displayPath);
+                     "/html/undeploy?path=" + displayPath));
                 args[7] = appsUndeploy;
                 
                 args[8] = highlightColor;

--- container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java	2011/01/11 08:08:51	1057517
+++ container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java	2011/01/11 08:13:05	1057518
@@ -581,7 +581,7 @@
                 }
 
                 writer.print("<a href=\"#" + (count++) + ".0\">");
-                writer.print(webModuleName);
+                writer.print(filter(webModuleName));
                 writer.print("</a>");
                 if (iterator.hasNext()) {
                     writer.print("<br>");
@@ -656,7 +656,7 @@
             }
 
             writer.print("<h1>");
-            writer.print(name);
+            writer.print(filter(name));
             writer.print("</h1>");
             writer.print("</a>");
 
@@ -784,11 +784,11 @@
                 mBeanServer.invoke(objectName, "findMappings", null, null);
             
             writer.print("<h2>");
-            writer.print(servletName);
+            writer.print(filter(servletName));
             if ((mappings != null) && (mappings.length > 0)) {
                 writer.print(" [ ");
                 for (int i = 0; i < mappings.length; i++) {
-                    writer.print(mappings[i]);
+                    writer.print(filter(mappings[i]));
                     if (i < mappings.length - 1) {
                         writer.print(" , ");
                     }