Index: org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
===================================================================
--- org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java	(revision 831814)
+++ org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java	(working copy)
@@ -184,7 +184,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ClusterSingleSignOn[");
+        StringBuilder sb = new StringBuilder("ClusterSingleSignOn[");
         if (container == null )
             sb.append("Container is null");
         else
Index: org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
===================================================================
--- org/apache/catalina/ha/authenticator/SingleSignOnMessage.java	(revision 831814)
+++ org/apache/catalina/ha/authenticator/SingleSignOnMessage.java	(working copy)
@@ -103,7 +103,7 @@
     public String getUniqueId() {
 	if (this.uniqueId != null)
 	    return this.uniqueId;
-	StringBuffer result = new StringBuffer(getSsoId());
+	StringBuilder result = new StringBuilder(getSsoId());
 	result.append("#-#");
 	result.append(System.currentTimeMillis());
 	return result.toString();
@@ -177,7 +177,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SingleSignOnMessage[action=");
+        StringBuilder sb = new StringBuilder("SingleSignOnMessage[action=");
 	sb.append(getAction()).append(", ssoId=").append(getSsoId());
 	sb.append(", sessionId=").append(getSessionId()).append(", username=");
 	sb.append(getUsername()).append("]");
Index: org/apache/catalina/ha/deploy/FileMessage.java
===================================================================
--- org/apache/catalina/ha/deploy/FileMessage.java	(revision 831814)
+++ org/apache/catalina/ha/deploy/FileMessage.java	(working copy)
@@ -91,7 +91,7 @@
     }
 
     public String getUniqueId() {
-        StringBuffer result = new StringBuffer(getFileName());
+        StringBuilder result = new StringBuilder(getFileName());
         result.append("#-#");
         result.append(getMessageNumber());
         result.append("#-#");
Index: org/apache/catalina/ha/session/BackupManager.java
===================================================================
--- org/apache/catalina/ha/session/BackupManager.java	(revision 831814)
+++ org/apache/catalina/ha/session/BackupManager.java	(working copy)
@@ -297,7 +297,7 @@
     }
 
     public String listSessionIdsFull() {
-        StringBuffer sb=new StringBuffer();
+        StringBuilder sb=new StringBuilder();
         LazyReplicatedMap map = (LazyReplicatedMap)sessions;
         Iterator keys = map.keySetFull().iterator();
         while (keys.hasNext()) {
Index: org/apache/catalina/ha/session/DeltaRequest.java
===================================================================
--- org/apache/catalina/ha/session/DeltaRequest.java	(revision 831814)
+++ org/apache/catalina/ha/session/DeltaRequest.java	(working copy)
@@ -375,7 +375,7 @@
         }
         
         public String toString() {
-            StringBuffer buf = new StringBuffer("AttributeInfo[type=");
+            StringBuilder buf = new StringBuilder("AttributeInfo[type=");
             buf.append(getType()).append(", action=").append(getAction());
             buf.append(", name=").append(getName()).append(", value=").append(getValue());
             buf.append(", addr=").append(super.toString()).append("]");
Index: org/apache/catalina/ha/session/DeltaSession.java
===================================================================
--- org/apache/catalina/ha/session/DeltaSession.java	(revision 831814)
+++ org/apache/catalina/ha/session/DeltaSession.java	(working copy)
@@ -416,7 +416,7 @@
      * Return a string representation of this object.
      */
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("DeltaSession[");
         sb.append(id);
         sb.append("]");
Index: org/apache/catalina/ha/session/ReplicatedSession.java
===================================================================
--- org/apache/catalina/ha/session/ReplicatedSession.java	(revision 831814)
+++ org/apache/catalina/ha/session/ReplicatedSession.java	(working copy)
@@ -253,7 +253,7 @@
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer("ReplicatedSession id=");
+        StringBuilder buf = new StringBuilder("ReplicatedSession id=");
         buf.append(getIdInternal()).append(" ref=").append(super.toString()).append("\n");
         java.util.Enumeration e = getAttributeNames();
         while ( e.hasMoreElements() ) {
Index: org/apache/catalina/ha/session/SerializablePrincipal.java
===================================================================
--- org/apache/catalina/ha/session/SerializablePrincipal.java	(revision 831814)
+++ org/apache/catalina/ha/session/SerializablePrincipal.java	(working copy)
@@ -187,7 +187,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SerializablePrincipal[");
+        StringBuilder sb = new StringBuilder("SerializablePrincipal[");
         sb.append(this.name);
         sb.append("]");
         return (sb.toString());
Index: org/apache/catalina/ha/session/SessionIDMessage.java
===================================================================
--- org/apache/catalina/ha/session/SessionIDMessage.java	(revision 831814)
+++ org/apache/catalina/ha/session/SessionIDMessage.java	(working copy)
@@ -38,7 +38,7 @@
 	private String contextPath;
 
 	public String getUniqueId() {
-		StringBuffer result = new StringBuffer(getOrignalSessionID());
+	    StringBuilder result = new StringBuilder(getOrignalSessionID());
 		result.append("#-#");
 		result.append(getHost());
                 result.append("#-#");
Index: org/apache/catalina/ha/tcp/ReplicationValve.java
===================================================================
--- org/apache/catalina/ha/tcp/ReplicationValve.java	(revision 831814)
+++ org/apache/catalina/ha/tcp/ReplicationValve.java	(working copy)
@@ -398,7 +398,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ReplicationValve[");
+        StringBuilder sb = new StringBuilder("ReplicationValve[");
         if (container != null)
             sb.append(container.getName());
         sb.append("]");