Index: org/apache/catalina/util/DOMWriter.java
===================================================================
--- org/apache/catalina/util/DOMWriter.java	(revision 831814)
+++ org/apache/catalina/util/DOMWriter.java	(working copy)
@@ -290,7 +290,7 @@
 
    /** Normalizes the given string. */
    protected String normalize(String s) {
-      StringBuffer str = new StringBuffer();
+      StringBuilder str = new StringBuilder();
 
       int len = (s != null) ? s.length() : 0;
       for ( int i = 0; i < len; i++ ) {
Index: org/apache/catalina/util/Extension.java
===================================================================
--- org/apache/catalina/util/Extension.java	(revision 831814)
+++ org/apache/catalina/util/Extension.java	(working copy)
@@ -220,7 +220,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("Extension[");
+        StringBuilder sb = new StringBuilder("Extension[");
         sb.append(extensionName);
         if (implementationURL != null) {
             sb.append(", implementationURL=");
Index: org/apache/catalina/util/HexUtils.java
===================================================================
--- org/apache/catalina/util/HexUtils.java	(revision 831814)
+++ org/apache/catalina/util/HexUtils.java	(working copy)
@@ -112,7 +112,7 @@
      */
     public static String convert(byte bytes[]) {
 
-        StringBuffer sb = new StringBuffer(bytes.length * 2);
+        StringBuilder sb = new StringBuilder(bytes.length * 2);
         for (int i = 0; i < bytes.length; i++) {
             sb.append(convertDigit((int) (bytes[i] >> 4)));
             sb.append(convertDigit((int) (bytes[i] & 0x0f)));
Index: org/apache/catalina/util/ManifestResource.java
===================================================================
--- org/apache/catalina/util/ManifestResource.java	(revision 831814)
+++ org/apache/catalina/util/ManifestResource.java	(working copy)
@@ -129,7 +129,7 @@
     
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ManifestResource[");
+        StringBuilder sb = new StringBuilder("ManifestResource[");
         sb.append(resourceName);
 
         sb.append(", isFulfilled=");
Index: org/apache/catalina/util/RequestUtil.java
===================================================================
--- org/apache/catalina/util/RequestUtil.java	(revision 831814)
+++ org/apache/catalina/util/RequestUtil.java	(working copy)
@@ -60,7 +60,7 @@
 
         char content[] = new char[message.length()];
         message.getChars(0, message.length(), content, 0);
-        StringBuffer result = new StringBuffer(content.length + 50);
+        StringBuilder result = new StringBuilder(content.length + 50);
         for (int i = 0; i < content.length; i++) {
             switch (content[i]) {
             case '<':
Index: org/apache/catalina/util/StringManager.java
===================================================================
--- org/apache/catalina/util/StringManager.java	(revision 831814)
+++ org/apache/catalina/util/StringManager.java	(working copy)
@@ -154,7 +154,7 @@
 
             iString = MessageFormat.format(value, nonNullArgs);
         } catch (IllegalArgumentException iae) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append(value);
             for (int i = 0; i < args.length; i++) {
                 buf.append(" arg[" + i + "]=" + args[i]);
Index: org/apache/catalina/util/URL.java
===================================================================
--- org/apache/catalina/util/URL.java	(revision 831814)
+++ org/apache/catalina/util/URL.java	(working copy)
@@ -531,7 +531,7 @@
      */
     public String toExternalForm() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (protocol != null) {
             sb.append(protocol);
             sb.append(":");
@@ -560,7 +560,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("URL[");
+        StringBuilder sb = new StringBuilder("URL[");
         sb.append("authority=");
         sb.append(authority);
         sb.append(", file=");
Index: org/apache/catalina/util/URLEncoder.java
===================================================================
--- org/apache/catalina/util/URLEncoder.java	(revision 831814)
+++ org/apache/catalina/util/URLEncoder.java	(working copy)
@@ -60,7 +60,7 @@
     public String encode( String path ) {
         int maxBytesPerChar = 10;
         int caseDiff = ('a' - 'A');
-        StringBuffer rewrittenPath = new StringBuffer(path.length());
+        StringBuilder rewrittenPath = new StringBuilder(path.length());
         ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
         OutputStreamWriter writer = null;
         try {