Index: org/apache/tomcat/util/buf/Base64.java
===================================================================
--- org/apache/tomcat/util/buf/Base64.java	(revision 831814)
+++ org/apache/tomcat/util/buf/Base64.java	(working copy)
@@ -239,7 +239,7 @@
 
     public static String base64Decode( String orig ) {
 	char chars[]=orig.toCharArray();
-	StringBuffer sb=new StringBuffer();
+	StringBuilder sb=new StringBuilder();
 	int i=0;
 
 	int shift = 0;   // # of excess bits stored in accum
Index: org/apache/tomcat/util/buf/HexUtils.java
===================================================================
--- org/apache/tomcat/util/buf/HexUtils.java	(revision 831814)
+++ org/apache/tomcat/util/buf/HexUtils.java	(working copy)
@@ -129,7 +129,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/tomcat/util/buf/UDecoder.java
===================================================================
--- org/apache/tomcat/util/buf/UDecoder.java	(revision 831814)
+++ org/apache/tomcat/util/buf/UDecoder.java	(working copy)
@@ -204,7 +204,7 @@
 	if( (!query || str.indexOf( '+' ) < 0) && str.indexOf( '%' ) < 0 )
 	    return str;
 	
-        StringBuffer dec = new StringBuffer();    // decoded string output
+        StringBuilder dec = new StringBuilder();    // decoded string output
         int strPos = 0;
         int strLen = str.length();
 
Index: org/apache/tomcat/util/digester/CallMethodRule.java
===================================================================
--- org/apache/tomcat/util/digester/CallMethodRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/CallMethodRule.java	(working copy)
@@ -536,7 +536,7 @@
         }
         
         if (target == null) {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("[CallMethodRule]{");
             sb.append(digester.match);
             sb.append("} Call target is null (");
@@ -550,7 +550,7 @@
         
         // Invoke the required method on the top object
         if (digester.log.isDebugEnabled()) {
-            StringBuffer sb = new StringBuffer("[CallMethodRule]{");
+            StringBuilder sb = new StringBuilder("[CallMethodRule]{");
             sb.append(digester.match);
             sb.append("} Call ");
             sb.append(target.getClass().getName());
@@ -606,7 +606,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("CallMethodRule[");
+        StringBuilder sb = new StringBuilder("CallMethodRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramCount=");
Index: org/apache/tomcat/util/digester/CallParamRule.java
===================================================================
--- org/apache/tomcat/util/digester/CallParamRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/CallParamRule.java	(working copy)
@@ -191,7 +191,7 @@
             
             if (digester.log.isDebugEnabled()) {
             
-                StringBuffer sb = new StringBuffer("[CallParamRule]{");
+                StringBuilder sb = new StringBuilder("[CallParamRule]{");
                 sb.append(digester.match);
                 sb.append("} Save from stack; from stack?").append(fromStack);
                 sb.append("; object=").append(param);
@@ -247,7 +247,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("CallParamRule[");
+        StringBuilder sb = new StringBuilder("CallParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append(", attributeName=");
Index: org/apache/tomcat/util/digester/Digester.java
===================================================================
--- org/apache/tomcat/util/digester/Digester.java	(revision 831814)
+++ org/apache/tomcat/util/digester/Digester.java	(working copy)
@@ -1333,7 +1333,7 @@
         }
 
         // Compute the current matching rule
-        StringBuffer sb = new StringBuffer(match);
+        StringBuilder sb = new StringBuilder(match);
         if (match.length() > 0) {
             sb.append('/');
         }
Index: org/apache/tomcat/util/digester/FactoryCreateRule.java
===================================================================
--- org/apache/tomcat/util/digester/FactoryCreateRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/FactoryCreateRule.java	(working copy)
@@ -444,7 +444,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("FactoryCreateRule[");
+        StringBuilder sb = new StringBuilder("FactoryCreateRule[");
         sb.append("className=");
         sb.append(className);
         sb.append(", attributeName=");
Index: org/apache/tomcat/util/digester/ObjectCreateRule.java
===================================================================
--- org/apache/tomcat/util/digester/ObjectCreateRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/ObjectCreateRule.java	(working copy)
@@ -228,7 +228,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ObjectCreateRule[");
+        StringBuilder sb = new StringBuilder("ObjectCreateRule[");
         sb.append("className=");
         sb.append(className);
         sb.append(", attributeName=");
Index: org/apache/tomcat/util/digester/ObjectParamRule.java
===================================================================
--- org/apache/tomcat/util/digester/ObjectParamRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/ObjectParamRule.java	(working copy)
@@ -112,7 +112,7 @@
      * Render a printable version of this Rule.
      */
     public String toString() {
-        StringBuffer sb = new StringBuffer("ObjectParamRule[");
+        StringBuilder sb = new StringBuilder("ObjectParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append(", attributeName=");
Index: org/apache/tomcat/util/digester/PathCallParamRule.java
===================================================================
--- org/apache/tomcat/util/digester/PathCallParamRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/PathCallParamRule.java	(working copy)
@@ -84,7 +84,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("PathCallParamRule[");
+        StringBuilder sb = new StringBuilder("PathCallParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append("]");
Index: org/apache/tomcat/util/digester/SetNextRule.java
===================================================================
--- org/apache/tomcat/util/digester/SetNextRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/SetNextRule.java	(working copy)
@@ -201,7 +201,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/tomcat/util/digester/SetPropertiesRule.java
===================================================================
--- org/apache/tomcat/util/digester/SetPropertiesRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/SetPropertiesRule.java	(working copy)
@@ -258,7 +258,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetPropertiesRule[");
+        StringBuilder sb = new StringBuilder("SetPropertiesRule[");
         sb.append("]");
         return (sb.toString());
 
Index: org/apache/tomcat/util/digester/SetPropertyRule.java
===================================================================
--- org/apache/tomcat/util/digester/SetPropertyRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/SetPropertyRule.java	(working copy)
@@ -141,7 +141,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetPropertyRule[");
+        StringBuilder sb = new StringBuilder("SetPropertyRule[");
         sb.append("name=");
         sb.append(name);
         sb.append(", value=");
Index: org/apache/tomcat/util/digester/SetRootRule.java
===================================================================
--- org/apache/tomcat/util/digester/SetRootRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/SetRootRule.java	(working copy)
@@ -202,7 +202,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetRootRule[");
+        StringBuilder sb = new StringBuilder("SetRootRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");
Index: org/apache/tomcat/util/digester/SetTopRule.java
===================================================================
--- org/apache/tomcat/util/digester/SetTopRule.java	(revision 831814)
+++ org/apache/tomcat/util/digester/SetTopRule.java	(working copy)
@@ -202,7 +202,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetTopRule[");
+        StringBuilder sb = new StringBuilder("SetTopRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");