2 files changed, 10 insertions, 6 deletions
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
index 205ad8bec84..5d4b729a569 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
@@ -44,6 +44,8 @@ import gnu.CORBA.IOR;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
 
+import gnu.java.lang.CPStringBuilder;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.DATA_CONVERSION;
 import org.omg.CORBA.ORB;
@@ -301,7 +303,7 @@ public class NameParser
             ior.Internet.version = new Version(major, minor);
 
             // Then host data goes till '/' or ':'.
-            StringBuffer bhost = new StringBuffer(corbaloc.length());
+            CPStringBuilder bhost = new CPStringBuilder(corbaloc.length());
             while (!t[p].equals(":") && !t[p].equals("/") && !t[p].equals(","))
               bhost.append(t[p++]);
 
@@ -394,7 +396,7 @@ public class NameParser
       {
         InputStreamReader r = new InputStreamReader(u.openStream());
 
-        StringBuffer b = new StringBuffer();
+        CPStringBuilder b = new CPStringBuilder();
         int c;
 
         while ((c = r.read()) > 0)
@@ -465,7 +467,7 @@ public class NameParser
               + "' found");
         }
 
-    StringBuffer bKey = new StringBuffer();
+    CPStringBuilder bKey = new CPStringBuilder();
     p++;
 
     while (p < t.length && !t[p].equals("#"))
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
index 7109fdb93e1..132c5dd8f04 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.CORBA.NamingService;
 
+import gnu.java.lang.CPStringBuilder;
+
 import org.omg.CORBA.IntHolder;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContextPackage.InvalidName;
@@ -125,7 +127,7 @@ public class NameTransformer
   {
     NameValidator.check(a_name);
 
-    StringBuffer b = new StringBuffer();
+    CPStringBuilder b = new CPStringBuilder();
 
     NameComponent n;
 
@@ -152,7 +154,7 @@ public class NameTransformer
    * @param b a buffer to append the contents to.
    * @param s a string to append.
    */
-  private void appEscaping(StringBuffer b, String s)
+  private void appEscaping(CPStringBuilder b, String s)
   {
     char c;
     for (int i = 0; i < s.length(); i++)
@@ -271,7 +273,7 @@ public class NameTransformer
    */
   private String readPart(IntHolder p, String[] t)
   {
-    StringBuffer part = new StringBuffer();
+    CPStringBuilder part = new CPStringBuilder();
 
     while (t [ p.value ] != null && !t [ p.value ].equals(".") &&
            !t [ p.value ].equals("/")