--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/TextUtil.java	Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/TextUtil.java	Mon Mar 28 10:53:34 2011 -0400
@@ -62,7 +62,7 @@
      * and {@code maxLen}.
      */
     public static String getRandomAlphaString(int minLen, int maxLen) {
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 	int length = (int)(Math.random() * (maxLen - minLen + 1)) + minLen;
 	for (int j = 0; j < length; j++) {
 	    char c = (char)((Math.random() * 26) + 97);
@@ -76,7 +76,7 @@
      * equivalents.
      */
     public static String escapeHTMLChars(String text) {
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 
 	for (char c : text.toCharArray()) {
 	    switch (c) {
@@ -148,7 +148,7 @@
 	// Replace newlines
 	text = text.replaceAll("\\s*[\\r\\n]\\s*", " ");
 
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 
 	String indent = indent1;
 	int w = width - indent.length();
@@ -210,7 +210,7 @@
     }
 
     public static String join(String delim, Object... list) {
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 
 	for (int i = 0; i < list.length; i++) {
 	    if (i != 0 && delim != null) {
@@ -332,7 +332,7 @@
      * characters with {@code repl}.
      */
     public static String toJavaIdentifier(String str, String repl) {
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 	for (char c : str.toCharArray()) {
 	    boolean empty = buffer.length() == 0;
 	    if ((empty && Character.isJavaIdentifierStart(c)) ||
@@ -346,7 +346,7 @@
     }
 
     public static String toJavaMethodName(String... words) {
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buffer = new StringBuilder();
 	for (String word : words) {
 	    try {
 		buffer.append(word.substring(0, 1).toUpperCase());