Index: org/apache/el/parser/AstCompositeExpression.java
===================================================================
--- org/apache/el/parser/AstCompositeExpression.java	(revision 831814)
+++ org/apache/el/parser/AstCompositeExpression.java	(working copy)
@@ -40,7 +40,7 @@
 
     public Object getValue(EvaluationContext ctx)
             throws ELException {
-        StringBuffer sb = new StringBuffer(16);
+        StringBuilder sb = new StringBuilder(16);
         Object obj = null;
         if (this.children != null) {
             for (int i = 0; i < this.children.length; i++) {
Index: org/apache/el/parser/AstLiteralExpression.java
===================================================================
--- org/apache/el/parser/AstLiteralExpression.java	(revision 831814)
+++ org/apache/el/parser/AstLiteralExpression.java	(working copy)
@@ -46,7 +46,7 @@
             return;
         }
         int size = image.length();
-        StringBuffer buf = new StringBuffer(size);
+        StringBuilder buf = new StringBuilder(size);
         for (int i = 0; i < size; i++) {
             char c = image.charAt(i);
             if (c == '\\' && i + 1 < size) {
Index: org/apache/el/parser/AstString.java
===================================================================
--- org/apache/el/parser/AstString.java	(revision 831814)
+++ org/apache/el/parser/AstString.java	(working copy)
@@ -57,7 +57,7 @@
             return;
         }
         int size = image.length();
-        StringBuffer buf = new StringBuffer(size);
+        StringBuilder buf = new StringBuilder(size);
         for (int i = 0; i < size; i++) {
             char c = image.charAt(i);
             if (c == '\\' && i + 1 < size) {
Index: org/apache/el/parser/ParseException.java
===================================================================
--- org/apache/el/parser/ParseException.java	(revision 831814)
+++ org/apache/el/parser/ParseException.java	(working copy)
@@ -100,7 +100,7 @@
     if (!specialConstructor) {
       return super.getMessage();
     }
-    StringBuffer expected = new StringBuffer();
+    StringBuilder expected = new StringBuilder();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -150,7 +150,7 @@
    * string literal.
    */
   protected String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
Index: org/apache/el/parser/TokenMgrError.java
===================================================================
--- org/apache/el/parser/TokenMgrError.java	(revision 831814)
+++ org/apache/el/parser/TokenMgrError.java	(working copy)
@@ -41,7 +41,7 @@
     * equivalents in the given string
     */
    protected static final String addEscapes(String str) {
-      StringBuffer retval = new StringBuffer();
+       StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))