Index: org/apache/catalina/connector/ClientAbortException.java
===================================================================
--- org/apache/catalina/connector/ClientAbortException.java	(revision 831814)
+++ org/apache/catalina/connector/ClientAbortException.java	(working copy)
@@ -127,7 +127,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ClientAbortException:  ");
+        StringBuilder sb = new StringBuilder("ClientAbortException:  ");
         if (message != null) {
             sb.append(message);
             if (throwable != null) {
Index: org/apache/catalina/connector/CoyotePrincipal.java
===================================================================
--- org/apache/catalina/connector/CoyotePrincipal.java	(revision 831814)
+++ org/apache/catalina/connector/CoyotePrincipal.java	(working copy)
@@ -64,7 +64,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("CoyotePrincipal[");
+        StringBuilder sb = new StringBuilder("CoyotePrincipal[");
         sb.append(this.name);
         sb.append("]");
         return (sb.toString());
Index: org/apache/catalina/connector/CoyoteReader.java
===================================================================
--- org/apache/catalina/connector/CoyoteReader.java	(revision 831814)
+++ org/apache/catalina/connector/CoyoteReader.java	(working copy)
@@ -147,7 +147,7 @@
         int pos = 0;
         int end = -1;
         int skip = -1;
-        StringBuffer aggregator = null;
+        StringBuilder aggregator = null;
         while (end < 0) {
             mark(MAX_LINE_LENGTH);
             while ((pos < MAX_LINE_LENGTH) && (end < 0)) {
@@ -183,7 +183,7 @@
             }
             if (end < 0) {
                 if (aggregator == null) {
-                    aggregator = new StringBuffer();
+                    aggregator = new StringBuilder();
                 }
                 aggregator.append(lineBuffer);
                 pos = 0;
Index: org/apache/catalina/connector/Request.java
===================================================================
--- org/apache/catalina/connector/Request.java	(revision 831814)
+++ org/apache/catalina/connector/Request.java	(working copy)
@@ -2390,7 +2390,7 @@
     protected String unescape(String s) {
         if (s==null) return null;
         if (s.indexOf('\\') == -1) return s;
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i=0; i<s.length(); i++) {
             char c = s.charAt(i);
             if (c!='\\') buf.append(c);
@@ -2629,7 +2629,7 @@
         if (white < 0)
             white = value.indexOf('\t');
         if (white >= 0) {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             int len = value.length();
             for (int i = 0; i < len; i++) {
                 char ch = value.charAt(i);
Index: org/apache/catalina/connector/Response.java
===================================================================
--- org/apache/catalina/connector/Response.java	(revision 831814)
+++ org/apache/catalina/connector/Response.java	(working copy)
@@ -1612,7 +1612,7 @@
             anchor = path.substring(pound);
             path = path.substring(0, pound);
         }
-        StringBuffer sb = new StringBuffer(path);
+        StringBuilder sb = new StringBuilder(path);
         if( sb.length() > 0 ) { // jsessionid can't be first.
             sb.append(";");
             sb.append(Globals.SESSION_PARAMETER_NAME);