2008-05-05 Andrew John Hughes <gnu_andrew@member.fsf.org>

	PR classpath/21869
	* gnu/java/net/protocol/ftp/FTPConnection.java,
	* gnu/java/net/protocol/jar/Handler.java,
	* gnu/java/rmi/server/RMIClassLoaderImpl.java,
	* gnu/java/rmi/server/RMIHashes.java:
	Swap use of StringBuffer for CPStringBuilder.

4 files changed, 18 insertions, 10 deletions

diff --git a/gnu/java/net/protocol/ftp/FTPConnection.java b/gnu/java/net/protocol/ftp/FTPConnection.java
index fd7901918..98e8a868d 100644
--- a/gnu/java/net/protocol/ftp/FTPConnection.java
+++ b/gnu/java/net/protocol/ftp/FTPConnection.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.ftp;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.net.CRLFInputStream;
 import gnu.java.net.CRLFOutputStream;
 import gnu.java.net.EmptyX509TrustManager;
@@ -621,7 +623,7 @@ public class FTPConnection
           }
         
         // Send PORT command
-        StringBuffer buf = new StringBuffer(PORT);
+        CPStringBuilder buf = new CPStringBuilder(PORT);
         buf.append(' ');
         // Construct the address/port string form
         byte[] address = localhost.getAddress();
@@ -686,7 +688,7 @@ public class FTPConnection
   public void setRepresentationType(int type)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer(TYPE);
+    CPStringBuilder buf = new CPStringBuilder(TYPE);
     buf.append(' ');
     switch (type)
       {
@@ -732,7 +734,7 @@ public class FTPConnection
   public void setFileStructure(int structure)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer(STRU);
+    CPStringBuilder buf = new CPStringBuilder(STRU);
     buf.append(' ');
     switch (structure)
       {
@@ -776,7 +778,7 @@ public class FTPConnection
   public void setTransferMode(int mode)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer(MODE);
+    CPStringBuilder buf = new CPStringBuilder(MODE);
     buf.append(' ');
     switch (mode)
       {
@@ -1286,7 +1288,7 @@ public class FTPConnection
       }
     else if (c == '-')
       {
-        StringBuffer buf = new StringBuffer(line.substring(4));
+        CPStringBuilder buf = new CPStringBuilder(line.substring(4));
         buf.append('\n');
         while(true)
           {
diff --git a/gnu/java/net/protocol/jar/Handler.java b/gnu/java/net/protocol/jar/Handler.java
index c57d0a360..66f0fb6d9 100644
--- a/gnu/java/net/protocol/jar/Handler.java
+++ b/gnu/java/net/protocol/jar/Handler.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.jar;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.net.URLParseError;
 
 import java.io.IOException;
@@ -180,7 +182,7 @@ public class Handler extends URLStreamHandler
 	  tokens.add(token);
       }
 
-    StringBuffer path = new StringBuffer(url_string.length());
+    CPStringBuilder path = new CPStringBuilder(url_string.length());
     path.append(url_string.substring(0, jar_stop + 1));
 
     Iterator<String> it = tokens.iterator();
@@ -205,7 +207,7 @@ public class Handler extends URLStreamHandler
     //  Do the concatenation manually to avoid resize StringBuffer's 
     //  internal buffer.  The length of ref is not taken into consideration
     //  as it's a rare path.
-    StringBuffer sb = new StringBuffer (file.length() + 5);
+    CPStringBuilder sb = new CPStringBuilder (file.length() + 5);
     sb.append ("jar:");
     sb.append (file);
     if (ref != null)
diff --git a/gnu/java/rmi/server/RMIClassLoaderImpl.java b/gnu/java/rmi/server/RMIClassLoaderImpl.java
index 4d5e1b026..9c3edef76 100644
--- a/gnu/java/rmi/server/RMIClassLoaderImpl.java
+++ b/gnu/java/rmi/server/RMIClassLoaderImpl.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.rmi.server;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -69,7 +71,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi
       if (urls.length == 0)
         return null;
 
-      StringBuffer annotation = new StringBuffer (64 * urls.length);
+      CPStringBuilder annotation = new CPStringBuilder (64 * urls.length);
 
       for (int i = 0; i < urls.length; i++)
       {
@@ -337,7 +339,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi
         if (urls.length == 0)
           return null;
         
-        StringBuffer annotation = new StringBuffer (64 * urls.length);
+        CPStringBuilder annotation = new CPStringBuilder (64 * urls.length);
         
         for (int i = 0; i < urls.length; i++)
           {
diff --git a/gnu/java/rmi/server/RMIHashes.java b/gnu/java/rmi/server/RMIHashes.java
index 5a414404d..c3665a4e7 100644
--- a/gnu/java/rmi/server/RMIHashes.java
+++ b/gnu/java/rmi/server/RMIHashes.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.rmi.server;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.lang.reflect.TypeSignature;
 
 import java.io.ByteArrayOutputStream;
@@ -61,7 +63,7 @@ public class RMIHashes
         ByteArrayOutputStream digest_out = new ByteArrayOutputStream();
         DataOutputStream data_out = new DataOutputStream (digest_out);
         
-        StringBuffer sbuf = new StringBuffer();
+        CPStringBuilder sbuf = new CPStringBuilder();
         sbuf.append(meth.getName());
         sbuf.append('(');
         Class params[] = meth.getParameterTypes();