ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
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.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/java/net/protocol/ftp/FTPConnection.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/net/protocol/ftp/FTPConnection.java,v
retrieving revision 1.5
diff -u -r1.5 FTPConnection.java
--- gnu/java/net/protocol/ftp/FTPConnection.java 18 Dec 2006 21:37:38
-0000 1.5
+++ gnu/java/net/protocol/ftp/FTPConnection.java 5 May 2008 03:11:25
-0000
@@ -38,6 +38,8 @@
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 @@
}
// 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 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 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 void setTransferMode(int mode)
throws IOException
{
- StringBuffer buf = new StringBuffer(MODE);
+ CPStringBuilder buf = new CPStringBuilder(MODE);
buf.append(' ');
switch (mode)
{
@@ -1286,7 +1288,7 @@
}
else if (c == '-')
{
- StringBuffer buf = new StringBuffer(line.substring(4));
+ CPStringBuilder buf = new CPStringBuilder(line.substring(4));
buf.append('\n');
while(true)
{
Index: gnu/java/net/protocol/jar/Handler.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/net/protocol/jar/Handler.java,v
retrieving revision 1.14
diff -u -r1.14 Handler.java
--- gnu/java/net/protocol/jar/Handler.java 18 Dec 2006 21:37:39 -0000
1.14
+++ gnu/java/net/protocol/jar/Handler.java 5 May 2008 03:11:25 -0000
@@ -38,6 +38,8 @@
package gnu.java.net.protocol.jar;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.net.URLParseError;
import java.io.IOException;
@@ -180,7 +182,7 @@
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 @@
// 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)
Index: gnu/java/rmi/server/RMIClassLoaderImpl.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java,v
retrieving revision 1.3
diff -u -r1.3 RMIClassLoaderImpl.java
--- gnu/java/rmi/server/RMIClassLoaderImpl.java 21 Sep 2007 19:39:19 -0000
1.3
+++ gnu/java/rmi/server/RMIClassLoaderImpl.java 5 May 2008 03:11:26 -0000
@@ -38,6 +38,8 @@
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 @@
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 @@
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++)
{
Index: gnu/java/rmi/server/RMIHashes.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/rmi/server/RMIHashes.java,v
retrieving revision 1.6
diff -u -r1.6 RMIHashes.java
--- gnu/java/rmi/server/RMIHashes.java 2 Jul 2005 20:32:14 -0000 1.6
+++ gnu/java/rmi/server/RMIHashes.java 5 May 2008 03:11:26 -0000
@@ -38,6 +38,8 @@
package gnu.java.rmi.server;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.lang.reflect.TypeSignature;
import java.io.ByteArrayOutputStream;
@@ -61,7 +63,7 @@
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();
