4 files changed, 15 insertions, 7 deletions
diff --git a/gnu/javax/naming/giop/CorbalocParser.java b/gnu/javax/naming/giop/CorbalocParser.java
index 397b1c7d9..95ebb8a06 100644
--- a/gnu/javax/naming/giop/CorbalocParser.java
+++ b/gnu/javax/naming/giop/CorbalocParser.java
@@ -43,6 +43,8 @@ import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
 import gnu.CORBA.NamingService.NameTransformer;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -288,7 +290,7 @@ public class CorbalocParser
             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++]);
 
@@ -381,7 +383,7 @@ public class CorbalocParser
       {
         InputStreamReader r = new InputStreamReader(u.openStream());
 
-        StringBuffer b = new StringBuffer();
+        CPStringBuilder b = new CPStringBuilder();
         int c;
 
         while ((c = r.read()) > 0)
@@ -418,7 +420,7 @@ public class CorbalocParser
               + "' found");
         }
 
-    StringBuffer bKey = new StringBuffer();
+    CPStringBuilder bKey = new CPStringBuilder();
     p++;
 
     while (p < t.length && !t[p].equals("#"))
diff --git a/gnu/javax/naming/giop/GiopNamingServiceFactory.java b/gnu/javax/naming/giop/GiopNamingServiceFactory.java
index 84aa32413..6c221548f 100644
--- a/gnu/javax/naming/giop/GiopNamingServiceFactory.java
+++ b/gnu/javax/naming/giop/GiopNamingServiceFactory.java
@@ -40,6 +40,8 @@ package gnu.javax.naming.giop;
 
 import gnu.CORBA.OrbFunctional;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -161,7 +163,7 @@ public class GiopNamingServiceFactory
   {
      TreeMap map = new TreeMap();
      map.putAll(props);
-     StringBuffer b = new StringBuffer(50*props.size());
+     CPStringBuilder b = new CPStringBuilder(50*props.size());
      
      Iterator iter = map.entrySet().iterator();
      Map.Entry m;
diff --git a/gnu/javax/naming/giop/ListBindingsEnumeration.java b/gnu/javax/naming/giop/ListBindingsEnumeration.java
index 00f4a0779..68ba49b3f 100644
--- a/gnu/javax/naming/giop/ListBindingsEnumeration.java
+++ b/gnu/javax/naming/giop/ListBindingsEnumeration.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.naming.giop;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.naming.NamingEnumeration;
 
 import org.omg.CosNaming.Binding;
@@ -92,7 +94,7 @@ public class ListBindingsEnumeration extends GiopNamingEnumeration implements
    */
   public Object convert(Binding binding)
   {
-    StringBuffer name = new StringBuffer();
+    CPStringBuilder name = new CPStringBuilder();
 
     for (int i = 0; i < binding.binding_name.length; i++)
       {
diff --git a/gnu/javax/naming/giop/ListEnumeration.java b/gnu/javax/naming/giop/ListEnumeration.java
index 2e64e67d3..3fca1e0ab 100644
--- a/gnu/javax/naming/giop/ListEnumeration.java
+++ b/gnu/javax/naming/giop/ListEnumeration.java
@@ -29,7 +29,7 @@ executable, regardless of the license terms of these independent
 modules, and to copy and distribute the resulting executable under
 terms of your choice, provided that you also meet, for each linked
 independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
+odule.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.naming.giop;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
 
@@ -85,7 +87,7 @@ public class ListEnumeration extends GiopNamingEnumeration implements
    */
   public Object convert(Binding binding)
   {
-    StringBuffer name = new StringBuffer();
+    CPStringBuilder name = new CPStringBuilder();
 
     for (int i = 0; i < binding.binding_name.length; i++)
       {