Index: org/apache/naming/HandlerRef.java
===================================================================
--- org/apache/naming/HandlerRef.java	(revision 831814)
+++ org/apache/naming/HandlerRef.java	(working copy)
@@ -159,7 +159,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("HandlerRef[");
+        StringBuilder sb = new StringBuilder("HandlerRef[");
         sb.append("className=");
         sb.append(getClassName());
         sb.append(",factoryClassLocation=");
Index: org/apache/naming/ResourceRef.java
===================================================================
--- org/apache/naming/ResourceRef.java	(revision 831814)
+++ org/apache/naming/ResourceRef.java	(working copy)
@@ -140,7 +140,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ResourceRef[");
+        StringBuilder sb = new StringBuilder("ResourceRef[");
         sb.append("className=");
         sb.append(getClassName());
         sb.append(",factoryClassLocation=");
Index: org/apache/naming/resources/DirContextURLStreamHandler.java
===================================================================
--- org/apache/naming/resources/DirContextURLStreamHandler.java	(revision 831814)
+++ org/apache/naming/resources/DirContextURLStreamHandler.java	(working copy)
@@ -107,7 +107,7 @@
         }
         if (u.getRef() != null) 
             len += 1 + u.getRef().length();
-        StringBuffer result = new StringBuffer(len);
+        StringBuilder result = new StringBuilder(len);
         result.append(u.getProtocol());
         result.append(":");
         if (u.getPath() != null) {
Index: org/apache/naming/StringManager.java
===================================================================
--- org/apache/naming/StringManager.java	(revision 831814)
+++ org/apache/naming/StringManager.java	(working copy)
@@ -120,10 +120,10 @@
  
             iString = MessageFormat.format(value, nonNullArgs);
 	} catch (IllegalArgumentException iae) {
-	    StringBuffer buf = new StringBuffer();
+	    StringBuilder buf = new StringBuilder();
 	    buf.append(value);
 	    for (int i = 0; i < args.length; i++) {
-		buf.append(" arg[" + i + "]=" + args[i]);
+	        buf.append(" arg[").append(i).append("]=").append(args[i]);
 	    }
 	    iString = buf.toString();
 	}
Index: org/apache/naming/ServiceRef.java
===================================================================
--- org/apache/naming/ServiceRef.java	(revision 831814)
+++ org/apache/naming/ServiceRef.java	(working copy)
@@ -188,7 +188,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ServiceRef[");
+        StringBuilder sb = new StringBuilder("ServiceRef[");
         sb.append("className=");
         sb.append(getClassName());
         sb.append(",factoryClassLocation=");