Index: org/apache/tomcat/util/http/HttpMessages.java
===================================================================
--- org/apache/tomcat/util/http/HttpMessages.java	(revision 831814)
+++ org/apache/tomcat/util/http/HttpMessages.java	(working copy)
@@ -82,7 +82,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 '<':
Index: org/apache/tomcat/util/http/Parameters.java
===================================================================
--- org/apache/tomcat/util/http/Parameters.java	(revision 831814)
+++ org/apache/tomcat/util/http/Parameters.java	(working copy)
@@ -588,7 +588,7 @@
     /** Debug purpose
      */
     public String paramsAsString() {
-        StringBuffer sb=new StringBuffer();
+        StringBuilder sb=new StringBuilder();
         Enumeration en= paramHashStringArray.keys();
         while( en.hasMoreElements() ) {
             String k=(String)en.nextElement();
Index: org/apache/tomcat/util/http/ServerCookie.java
===================================================================
--- org/apache/tomcat/util/http/ServerCookie.java	(revision 831814)
+++ org/apache/tomcat/util/http/ServerCookie.java	(working copy)
@@ -432,7 +432,7 @@
             return s;
         }
 
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         for (int i = beginIndex; i < endIndex; i++) {
             char c = s.charAt(i);
             if (c == '\\' ) {