Index: org/apache/catalina/ssi/ExpressionParseTree.java
===================================================================
--- org/apache/catalina/ssi/ExpressionParseTree.java	(revision 831814)
+++ org/apache/catalina/ssi/ExpressionParseTree.java	(working copy)
@@ -211,12 +211,12 @@
      * A node the represents a String value
      */
     private class StringNode extends Node {
-        StringBuffer value;
+        StringBuilder value;
         String resolved = null;
 
 
         public StringNode(String value) {
-            this.value = new StringBuffer(value);
+            this.value = new StringBuilder(value);
         }
 
 
Index: org/apache/catalina/ssi/SSIFsize.java
===================================================================
--- org/apache/catalina/ssi/SSIFsize.java	(revision 831814)
+++ org/apache/catalina/ssi/SSIFsize.java	(working copy)
@@ -74,7 +74,7 @@
         if (numChars < 0) {
             throw new IllegalArgumentException("Num chars can't be negative");
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i = 0; i < numChars; i++) {
             buf.append(aChar);
         }
Index: org/apache/catalina/ssi/SSIMediator.java
===================================================================
--- org/apache/catalina/ssi/SSIMediator.java	(revision 831814)
+++ org/apache/catalina/ssi/SSIMediator.java	(working copy)
@@ -216,7 +216,7 @@
         val = val.replace("&quot;", "\"");
         val = val.replace("&amp;", "&");
 
-        StringBuffer sb = new StringBuffer(val);
+        StringBuilder sb = new StringBuilder(val);
         int charStart = sb.indexOf("&#");
         while (charStart > -1) {
             int charEnd = sb.indexOf(";", charStart);
Index: org/apache/catalina/ssi/SSIProcessor.java
===================================================================
--- org/apache/catalina/ssi/SSIProcessor.java	(revision 831814)
+++ org/apache/catalina/ssi/SSIProcessor.java	(working copy)
@@ -187,7 +187,7 @@
         int i = 0;
         int quotes = 0;
         boolean inside = false;
-        StringBuffer retBuf = new StringBuffer();
+        StringBuilder retBuf = new StringBuilder();
         while (bIdx < cmd.length()) {
             if (!inside) {
                 while (bIdx < cmd.length() && isSpace(cmd.charAt(bIdx)))
@@ -236,7 +236,7 @@
         int valIndex = 0;
         boolean inside = false;
         String[] vals = new String[count];
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         char endQuote = 0;
         for (int bIdx = start; bIdx < cmd.length(); bIdx++) {
             if (!inside) {
Index: org/apache/catalina/ssi/SSIServletExternalResolver.java
===================================================================
--- org/apache/catalina/ssi/SSIServletExternalResolver.java	(revision 831814)
+++ org/apache/catalina/ssi/SSIServletExternalResolver.java	(working copy)
@@ -196,7 +196,7 @@
                     Enumeration acceptHeaders = req.getHeaders(accept);
                     if (acceptHeaders != null)
                         if (acceptHeaders.hasMoreElements()) {
-                            StringBuffer rv = new StringBuffer(
+                            StringBuilder rv = new StringBuilder(
                                     (String) acceptHeaders.nextElement());
                             while (acceptHeaders.hasMoreElements()) {
                                 rv.append(", ");
@@ -313,7 +313,7 @@
             } else if (nameParts[1].equals("PROTOCOL")) {
                 retVal = req.getProtocol();
             } else if (nameParts[1].equals("SOFTWARE")) {
-                StringBuffer rv = new StringBuffer(context.getServerInfo());
+                StringBuilder rv = new StringBuilder(context.getServerInfo());
                 rv.append(" ");
                 rv.append(System.getProperty("java.vm.name"));
                 rv.append("/");