Index: org/apache/catalina/core/ApplicationContext.java
===================================================================
--- org/apache/catalina/core/ApplicationContext.java	(revision 831814)
+++ org/apache/catalina/core/ApplicationContext.java	(working copy)
@@ -902,7 +902,7 @@
         while (childPaths.hasMoreElements()) {
             Binding binding = (Binding) childPaths.nextElement();
             String name = binding.getName();
-            StringBuffer childPath = new StringBuffer(path);
+            StringBuilder childPath = new StringBuilder(path);
             if (!"/".equals(path) && !path.endsWith("/"))
                 childPath.append("/");
             childPath.append(name);
Index: org/apache/catalina/core/ApplicationFilterConfig.java
===================================================================
--- org/apache/catalina/core/ApplicationFilterConfig.java	(revision 831814)
+++ org/apache/catalina/core/ApplicationFilterConfig.java	(working copy)
@@ -213,7 +213,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ApplicationFilterConfig[");
+        StringBuilder sb = new StringBuilder("ApplicationFilterConfig[");
         sb.append("name=");
         sb.append(filterDef.getFilterName());
         sb.append(", filterClass=");
Index: org/apache/catalina/core/ContainerBase.java
===================================================================
--- org/apache/catalina/core/ContainerBase.java	(revision 831814)
+++ org/apache/catalina/core/ContainerBase.java	(working copy)
@@ -1496,7 +1496,7 @@
         Container host=null;
         Container servlet=null;
         
-        StringBuffer suffix=new StringBuffer();
+        StringBuilder suffix=new StringBuilder();
         
         if( container instanceof StandardHost ) {
             host=container;
Index: org/apache/catalina/core/StandardContext.java
===================================================================
--- org/apache/catalina/core/StandardContext.java	(revision 831814)
+++ org/apache/catalina/core/StandardContext.java	(working copy)
@@ -4701,7 +4701,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (getParent() != null) {
             sb.append(getParent().toString());
             sb.append(".");
@@ -4973,7 +4973,7 @@
         namingContextName = getName();
         } else {
         Stack stk = new Stack();
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
         while (parent != null) {
             stk.push(parent.getName());
             parent = parent.getParent();
@@ -5194,7 +5194,7 @@
         }
         BufferedReader br = new BufferedReader(
                                 new InputStreamReader(stream));
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         String strRead = "";
         try {
             while (strRead != null) {
Index: org/apache/catalina/core/StandardEngine.java
===================================================================
--- org/apache/catalina/core/StandardEngine.java	(revision 831814)
+++ org/apache/catalina/core/StandardEngine.java	(working copy)
@@ -461,7 +461,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("StandardEngine[");
+        StringBuilder sb = new StringBuilder("StandardEngine[");
         sb.append(getName());
         sb.append("]");
         return (sb.toString());
Index: org/apache/catalina/core/StandardHost.java
===================================================================
--- org/apache/catalina/core/StandardHost.java	(revision 831814)
+++ org/apache/catalina/core/StandardHost.java	(working copy)
@@ -646,7 +646,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (getParent() != null) {
             sb.append(getParent().toString());
             sb.append(".");
Index: org/apache/catalina/core/StandardServer.java
===================================================================
--- org/apache/catalina/core/StandardServer.java	(revision 831814)
+++ org/apache/catalina/core/StandardServer.java	(working copy)
@@ -399,7 +399,7 @@
             }
 
             // Read a set of characters from the socket
-            StringBuffer command = new StringBuffer();
+            StringBuilder command = new StringBuilder();
             int expected = 1024; // Cut off to avoid DoS attack
             while (expected < shutdown.length()) {
                 if (random == null)
@@ -563,7 +563,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("StandardServer[");
+        StringBuilder sb = new StringBuilder("StandardServer[");
         sb.append(getPort());
         sb.append("]");
         return (sb.toString());
Index: org/apache/catalina/core/StandardService.java
===================================================================
--- org/apache/catalina/core/StandardService.java	(revision 831814)
+++ org/apache/catalina/core/StandardService.java	(working copy)
@@ -375,7 +375,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("StandardService[");
+        StringBuilder sb = new StringBuilder("StandardService[");
         sb.append(getName());
         sb.append("]");
         return (sb.toString());
Index: org/apache/catalina/core/StandardWrapper.java
===================================================================
--- org/apache/catalina/core/StandardWrapper.java	(revision 831814)
+++ org/apache/catalina/core/StandardWrapper.java	(working copy)
@@ -1303,7 +1303,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (getParent() != null) {
             sb.append(getParent().toString());
             sb.append(".");