Index: org/apache/catalina/manager/JMXProxyServlet.java
===================================================================
--- org/apache/catalina/manager/JMXProxyServlet.java	(revision 831814)
+++ org/apache/catalina/manager/JMXProxyServlet.java	(working copy)
@@ -201,7 +201,7 @@
         if( idx < 0 ) return value;
 
         int prev=0;
-        StringBuffer sb=new StringBuffer();
+        StringBuilder sb=new StringBuilder();
         while( idx >= 0 ) {
             appendHead(sb, value, prev, idx);
 
@@ -215,7 +215,7 @@
         return sb.toString();
     }
 
-    private void appendHead( StringBuffer sb, String value, int start, int end) {
+    private void appendHead( StringBuilder sb, String value, int start, int end) {
         if (end < 1) return;
 
         int pos=start;
Index: org/apache/catalina/manager/JspHelper.java
===================================================================
--- org/apache/catalina/manager/JspHelper.java	(revision 831814)
+++ org/apache/catalina/manager/JspHelper.java	(working copy)
@@ -108,7 +108,7 @@
     }
 
     public static String secondsToTimeString(long in_seconds) {
-        StringBuffer buff = new StringBuffer(9);
+        StringBuilder buff = new StringBuilder(9);
         long rest = in_seconds;
         long hour = rest / 3600;
         rest = rest % 3600;
@@ -208,16 +208,16 @@
         int start = 0;
         int length = buffer.length();
         char[] arrayBuffer = buffer.toCharArray();
-        StringBuffer escapedBuffer = null;
+        StringBuilder escapedBuffer = null;
 
         for (int i = 0; i < length; i++) {
             char c = arrayBuffer[i];
             if (c <= HIGHEST_SPECIAL) {
                 char[] escaped = specialCharactersRepresentation[c];
                 if (escaped != null) {
-                    // create StringBuffer to hold escaped xml string
+                    // create StringBuilder to hold escaped xml string
                     if (start == 0) {
-                        escapedBuffer = new StringBuffer(length + 5);
+                        escapedBuffer = new StringBuilder(length + 5);
                     }
                     // add unescaped portion
                     if (start < i) {
Index: org/apache/catalina/manager/ManagerServlet.java
===================================================================
--- org/apache/catalina/manager/ManagerServlet.java	(revision 831814)
+++ org/apache/catalina/manager/ManagerServlet.java	(working copy)
@@ -1067,7 +1067,7 @@
         if (debug >= 1)
             log("serverinfo");
         try {
-            StringBuffer props = new StringBuffer();
+            StringBuilder props = new StringBuilder();
             props.append("OK - Server info");
             props.append("\nTomcat Version: ");
             props.append(ServerInfo.getServerInfo());
Index: org/apache/catalina/manager/StatusTransformer.java
===================================================================
--- org/apache/catalina/manager/StatusTransformer.java	(revision 831814)
+++ org/apache/catalina/manager/StatusTransformer.java	(working copy)
@@ -831,7 +831,7 @@
 
         char content[] = new char[message.length()];
         message.getChars(0, message.length(), content, 0);
-        StringBuffer result = new StringBuffer(content.length + 50);
+        StringBuilder result = new StringBuilder(content.length + 50);
         for (int i = 0; i < content.length; i++) {
             switch (content[i]) {
             case '<':