Index: org/apache/catalina/valves/AccessLogValve.java
===================================================================
--- org/apache/catalina/valves/AccessLogValve.java	(revision 832264)
+++ org/apache/catalina/valves/AccessLogValve.java	(working copy)
@@ -766,7 +766,7 @@
     
     
     private String calculateTimeZoneOffset(long offset) {
-        StringBuffer tz = new StringBuffer();
+        StringBuilder tz = new StringBuilder();
         if ((offset < 0)) {
             tz.append("-");
             offset = -offset;
@@ -991,7 +991,7 @@
                 Response response, long time) {
             AccessDateStruct struct = currentDateStruct.get();
             if (struct.currentDateString == null) {
-                StringBuffer current = new StringBuffer(32);
+                StringBuilder current = new StringBuilder(32);
                 current.append('[');
                 current.append(struct.dayFormatter.format(date));
                 current.append('/');
@@ -1343,7 +1343,7 @@
     protected AccessLogElement[] createLogElements() {
         List<AccessLogElement> list = new ArrayList<AccessLogElement>();
         boolean replace = false;
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i = 0; i < pattern.length(); i++) {
             char ch = pattern.charAt(i);
             if (replace) {
@@ -1352,7 +1352,7 @@
                  * not enounter a closing } - then I ignore the {
                  */
                 if ('{' == ch) {
-                    StringBuffer name = new StringBuffer();
+                    StringBuilder name = new StringBuilder();
                     int j = i + 1;
                     for (; j < pattern.length() && '}' != pattern.charAt(j); j++) {
                         name.append(pattern.charAt(j));
@@ -1375,7 +1375,7 @@
             } else if (ch == '%') {
                 replace = true;
                 list.add(new StringElement(buf.toString()));
-                buf = new StringBuffer();
+                buf = new StringBuilder();
             } else {
                 buf.append(ch);
             }
Index: org/apache/catalina/valves/ExtendedAccessLogValve.java
===================================================================
--- org/apache/catalina/valves/ExtendedAccessLogValve.java	(revision 832264)
+++ org/apache/catalina/valves/ExtendedAccessLogValve.java	(working copy)
@@ -186,7 +186,7 @@
         }
 
         /* Wrap all quotes in double quotes. */
-        StringBuffer buffer = new StringBuffer(svalue.length() + 2);
+        StringBuilder buffer = new StringBuilder(svalue.length() + 2);
         buffer.append('\'');
         int i = 0;
         while (i < svalue.length()) {
@@ -343,7 +343,7 @@
            if (null != response) {
                 String[] values = response.getHeaderValues(header);
                 if(values.length > 0) {
-                    StringBuffer buffer = new StringBuffer();
+                    StringBuilder buffer = new StringBuilder();
                     for (int i = 0; i < values.length; i++) {
                         String string = values[i];
                         buffer.append(string) ;
@@ -412,7 +412,7 @@
     
     protected class PatternTokenizer {
         private StringReader sr = null;
-        private StringBuffer buf = new StringBuffer();
+        private StringBuilder buf = new StringBuilder();
         private boolean ended = false;
         private boolean subToken;
         private boolean parameter;
@@ -442,22 +442,22 @@
                 switch (c) {
                 case ' ':
                     result = buf.toString();
-                    buf = new StringBuffer();
+                    buf = new StringBuilder();
                     buf.append((char) c);
                     return result;
                 case '-':
                     result = buf.toString();
-                    buf = new StringBuffer();
+                    buf = new StringBuilder();
                     subToken = true;
                     return result;
                 case '(':
                     result = buf.toString();
-                    buf = new StringBuffer();
+                    buf = new StringBuilder();
                     parameter = true;
                     return result;
                 case ')':
                     result = buf.toString();
-                    buf = new StringBuffer();
+                    buf = new StringBuilder();
                     break;
                 default:
                     buf.append((char) c);
@@ -482,7 +482,7 @@
             while (c != -1) {
                 if (c == ')') {
                     result = buf.toString();
-                    buf = new StringBuffer();
+                    buf = new StringBuilder();
                     return result;
                 }
                 buf.append((char) c);
@@ -494,10 +494,10 @@
         public String getWhiteSpaces() throws IOException {
             if(isEnded())
                 return "" ;
-            StringBuffer whiteSpaces = new StringBuffer();
+            StringBuilder whiteSpaces = new StringBuilder();
             if (buf.length() > 0) {
                 whiteSpaces.append(buf);
-                buf = new StringBuffer();
+                buf = new StringBuilder();
             }
             int c = sr.read();
             while (Character.isWhitespace((char) c)) {
@@ -517,7 +517,7 @@
         }
         
         public String getRemains() throws IOException {
-            StringBuffer remains = new StringBuffer();
+            StringBuilder remains = new StringBuilder();
             for(int c = sr.read(); c != -1; c = sr.read()) {
                 remains.append((char) c);
             }