Index: org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
===================================================================
--- org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(revision 831814)
+++ org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(working copy)
@@ -236,7 +236,7 @@
         }
 
         // Build the connection string with fixed ports
-        StringBuffer url = new StringBuffer();
+        StringBuilder url = new StringBuilder();
         url.append("service:jmx:rmi://localhost:");
         url.append(theRmiServerPort);
         url.append("/jndi/rmi://localhost:");
Index: org/apache/catalina/mbeans/MBeanUtils.java
===================================================================
--- org/apache/catalina/mbeans/MBeanUtils.java	(revision 831814)
+++ org/apache/catalina/mbeans/MBeanUtils.java	(working copy)
@@ -746,7 +746,7 @@
                 IntrospectionUtils.getProperty(connector, "address");
             Integer port = (Integer)
                 IntrospectionUtils.getProperty(connector, "port");
-            StringBuffer sb = new StringBuffer(domain);
+            StringBuilder sb = new StringBuilder(domain);
             sb.append(":type=Connector");
             sb.append(",port=" + port);
             if ((address != null) && (address.length()>0)) {