Index: org/apache/catalina/startup/ContextConfig.java
===================================================================
--- org/apache/catalina/startup/ContextConfig.java	(revision 831814)
+++ org/apache/catalina/startup/ContextConfig.java	(working copy)
@@ -1342,7 +1342,7 @@
 
     
     protected String getHostConfigPath(String resourceName) {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         Container container = context;
         Container host = null;
         Container engine = null;
Index: org/apache/catalina/startup/PasswdUserDatabase.java
===================================================================
--- org/apache/catalina/startup/PasswdUserDatabase.java	(revision 831814)
+++ org/apache/catalina/startup/PasswdUserDatabase.java	(working copy)
@@ -139,7 +139,7 @@
             while (true) {
 
                 // Accumulate the next line
-                StringBuffer buffer = new StringBuffer();
+                StringBuilder buffer = new StringBuilder();
                 while (true) {
                     int ch = reader.read();
                     if ((ch < 0) || (ch == '\n'))
Index: org/apache/catalina/startup/SetNextNamingRule.java
===================================================================
--- org/apache/catalina/startup/SetNextNamingRule.java	(revision 831814)
+++ org/apache/catalina/startup/SetNextNamingRule.java	(working copy)
@@ -106,7 +106,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetNextRule[");
+        StringBuilder sb = new StringBuilder("SetNextRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");
Index: org/apache/catalina/startup/WebRuleSet.java
===================================================================
--- org/apache/catalina/startup/WebRuleSet.java	(revision 831814)
+++ org/apache/catalina/startup/WebRuleSet.java	(working copy)
@@ -758,7 +758,7 @@
         }
 
         if (target == null) {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("[CallMethodRule]{");
             sb.append("");
             sb.append("} Call target is null (");