Index: org/apache/catalina/servlets/CGIServlet.java
===================================================================
--- org/apache/catalina/servlets/CGIServlet.java	(revision 831814)
+++ org/apache/catalina/servlets/CGIServlet.java	(working copy)
@@ -1105,8 +1105,8 @@
          * directory to enable CGI script to be executed.
          */
         protected void expandCGIScript() {
-            StringBuffer srcPath = new StringBuffer();
-            StringBuffer destPath = new StringBuffer();
+            StringBuilder srcPath = new StringBuilder();
+            StringBuilder destPath = new StringBuilder();
             InputStream is = null;
 
             // paths depend on mapping
@@ -1190,7 +1190,7 @@
          */
         public String toString() {
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
             sb.append("<TABLE border=2>");
 
@@ -1604,7 +1604,7 @@
             int bufRead = -1;
 
             //create query arguments
-            StringBuffer cmdAndArgs = new StringBuffer();
+            StringBuilder cmdAndArgs = new StringBuilder();
             if (command.indexOf(" ") < 0) {
                 cmdAndArgs.append(command);
             } else {
@@ -1627,7 +1627,7 @@
                 }
             }
 
-            StringBuffer command = new StringBuffer(cgiExecutable);
+            StringBuilder command = new StringBuilder(cgiExecutable);
             command.append(" ");
             command.append(cmdAndArgs.toString());
             cmdAndArgs = command;
Index: org/apache/catalina/servlets/DefaultServlet.java
===================================================================
--- org/apache/catalina/servlets/DefaultServlet.java	(revision 831814)
+++ org/apache/catalina/servlets/DefaultServlet.java	(working copy)
@@ -375,7 +375,7 @@
     protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
 
-        StringBuffer allow = new StringBuffer();
+        StringBuilder allow = new StringBuilder();
         // There is a doGet method
         allow.append("GET, HEAD");
         // There is a doPost
@@ -1149,7 +1149,7 @@
                                     InputStream xsltInputStream)
         throws IOException, ServletException {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("<?xml version=\"1.0\"?>");
         sb.append("<listing ");
@@ -1274,7 +1274,7 @@
         OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
         PrintWriter writer = new PrintWriter(osWriter);
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         
         // rewriteUrl(contextPath) is expensive. cache result for later reuse
         String rewrittenContextPath =  rewriteUrl(contextPath);
Index: org/apache/catalina/servlets/InvokerServlet.java
===================================================================
--- org/apache/catalina/servlets/InvokerServlet.java	(revision 831814)
+++ org/apache/catalina/servlets/InvokerServlet.java	(working copy)
@@ -344,7 +344,7 @@
         InvokerHttpRequest wrequest =
             new InvokerHttpRequest(request);
         wrequest.setRequestURI(inRequestURI);
-        StringBuffer sb = new StringBuffer(inServletPath);
+        StringBuilder sb = new StringBuilder(inServletPath);
         sb.append("/");
         sb.append(servletClass);
         wrequest.setServletPath(sb.toString());
Index: org/apache/catalina/servlets/WebdavServlet.java
===================================================================
--- org/apache/catalina/servlets/WebdavServlet.java	(revision 831814)
+++ org/apache/catalina/servlets/WebdavServlet.java	(working copy)
@@ -407,7 +407,7 @@
 
         resp.addHeader("DAV", "1,2");
 
-        StringBuffer methodsAllowed = determineMethodsAllowed(resources,
+        StringBuilder methodsAllowed = determineMethodsAllowed(resources,
                                                               req);
 
         resp.addHeader("Allow", methodsAllowed.toString());
@@ -424,7 +424,7 @@
 
         if (!listings) {
             // Get allowed methods
-            StringBuffer methodsAllowed = determineMethodsAllowed(resources,
+            StringBuilder methodsAllowed = determineMethodsAllowed(resources,
                                                                   req);
 
             resp.addHeader("Allow", methodsAllowed.toString());
@@ -730,7 +730,7 @@
         // path
         if (exists) {
             // Get allowed methods
-            StringBuffer methodsAllowed = determineMethodsAllowed(resources,
+            StringBuilder methodsAllowed = determineMethodsAllowed(resources,
                                                                   req);
 
             resp.addHeader("Allow", methodsAllowed.toString());
@@ -2599,7 +2599,7 @@
      * Get creation date in ISO format.
      */
     private String getISOCreationDate(long creationDate) {
-        StringBuffer creationDateValue = new StringBuffer
+        StringBuilder creationDateValue = new StringBuilder
             (creationDateFormat.format
              (new Date(creationDate)));
         /*
@@ -2626,10 +2626,10 @@
      * Determines the methods normally allowed for the resource.
      *
      */
-    private StringBuffer determineMethodsAllowed(DirContext resources,
+    private StringBuilder determineMethodsAllowed(DirContext resources,
                                                  HttpServletRequest req) {
 
-        StringBuffer methodsAllowed = new StringBuffer();
+        StringBuilder methodsAllowed = new StringBuilder();
         boolean exists = true;
         Object object = null;
         try {