Index: org/apache/catalina/realm/DataSourceRealm.java
===================================================================
--- org/apache/catalina/realm/DataSourceRealm.java	(revision 831814)
+++ org/apache/catalina/realm/DataSourceRealm.java	(working copy)
@@ -626,7 +626,7 @@
         super.start();
 
         // Create the roles PreparedStatement string
-        StringBuffer temp = new StringBuffer("SELECT ");
+        StringBuilder temp = new StringBuilder("SELECT ");
         temp.append(roleNameCol);
         temp.append(" FROM ");
         temp.append(userRoleTable);
@@ -636,7 +636,7 @@
         preparedRoles = temp.toString();
 
         // Create the credentials PreparedStatement string
-        temp = new StringBuffer("SELECT ");
+        temp = new StringBuilder("SELECT ");
         temp.append(userCredCol);
         temp.append(" FROM ");
         temp.append(userTable);
Index: org/apache/catalina/realm/GenericPrincipal.java
===================================================================
--- org/apache/catalina/realm/GenericPrincipal.java	(revision 831814)
+++ org/apache/catalina/realm/GenericPrincipal.java	(working copy)
@@ -185,7 +185,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("GenericPrincipal[");
+        StringBuilder sb = new StringBuilder("GenericPrincipal[");
         sb.append(this.name);
         sb.append("(");
         for( int i=0;i<roles.length; i++ ) {
Index: org/apache/catalina/realm/JDBCRealm.java
===================================================================
--- org/apache/catalina/realm/JDBCRealm.java	(revision 831814)
+++ org/apache/catalina/realm/JDBCRealm.java	(working copy)
@@ -484,7 +484,7 @@
         throws SQLException {
 
         if (preparedCredentials == null) {
-            StringBuffer sb = new StringBuffer("SELECT ");
+            StringBuilder sb = new StringBuilder("SELECT ");
             sb.append(userCredCol);
             sb.append(" FROM ");
             sb.append(userTable);
@@ -737,7 +737,7 @@
         throws SQLException {
 
         if (preparedRoles == null) {
-            StringBuffer sb = new StringBuffer("SELECT ");
+            StringBuilder sb = new StringBuilder("SELECT ");
             sb.append(roleNameCol);
             sb.append(" FROM ");
             sb.append(userRoleTable);
Index: org/apache/catalina/realm/JNDIRealm.java
===================================================================
--- org/apache/catalina/realm/JNDIRealm.java	(revision 831814)
+++ org/apache/catalina/realm/JNDIRealm.java	(working copy)
@@ -2076,7 +2076,7 @@
      * @return String the escaped/encoded result
      */
     protected String doRFC2254Encoding(String inString) {
-        StringBuffer buf = new StringBuffer(inString.length());
+        StringBuilder buf = new StringBuilder(inString.length());
         for (int i = 0; i < inString.length(); i++) {
             char c = inString.charAt(i);
             switch (c) {
Index: org/apache/catalina/realm/RealmBase.java
===================================================================
--- org/apache/catalina/realm/RealmBase.java	(revision 831814)
+++ org/apache/catalina/realm/RealmBase.java	(working copy)
@@ -940,7 +940,7 @@
         }
 
         // Redirect to the corresponding SSL port
-        StringBuffer file = new StringBuffer();
+        StringBuilder file = new StringBuilder();
         String protocol = "https";
         String host = request.getServerName();
         // Protocol