bug 3021 - replace StringBuffer with StringBuilder

25 files changed, 185 insertions, 109 deletions

diff --git a/java/demo/Database/library/LibraryI.java b/java/demo/Database/library/LibraryI.java
index 81bae5c6de7..9ec48815b36 100644
--- a/java/demo/Database/library/LibraryI.java
+++ b/java/demo/Database/library/LibraryI.java
@@ -90,7 +90,8 @@ class LibraryI extends _LibraryDisp
             }
 
             // Build a query that finds all books by these authors.
-            StringBuffer sb = new StringBuffer("(");
+            StringBuilder sb = new StringBuilder(128);
+            sb.append("(");
             boolean front = true;
             do
             {
diff --git a/java/demo/Database/library/Scanner.java b/java/demo/Database/library/Scanner.java
index 879396725b4..ecf325de077 100644
--- a/java/demo/Database/library/Scanner.java
+++ b/java/demo/Database/library/Scanner.java
@@ -151,7 +151,7 @@ class Scanner
             return null;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
 
         if(c == ';' || c == '\n')
         {
diff --git a/java/demo/Freeze/library/Scanner.java b/java/demo/Freeze/library/Scanner.java
index 975eaece2dd..ff61f1289da 100644
--- a/java/demo/Freeze/library/Scanner.java
+++ b/java/demo/Freeze/library/Scanner.java
@@ -155,7 +155,7 @@ class Scanner
             return null;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
 
         if(c == ';' || c == '\n')
         {
diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java
index db438f8fe5f..790a672f7b0 100644
--- a/java/demo/Freeze/phonebook/Scanner.java
+++ b/java/demo/Freeze/phonebook/Scanner.java
@@ -155,7 +155,7 @@ class Scanner
             return null;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
 
         if(c == ';' || c == '\n')
         {
diff --git a/java/demo/Ice/protobuf/ant/ProtocTask.java b/java/demo/Ice/protobuf/ant/ProtocTask.java
index ba981a27db0..b102cb9fccd 100644
--- a/java/demo/Ice/protobuf/ant/ProtocTask.java
+++ b/java/demo/Ice/protobuf/ant/ProtocTask.java
@@ -174,7 +174,7 @@ public class ProtocTask extends org.apache.tools.ant.Task
                 translator = _translator.toString();
             }
 
-            StringBuffer cmd = new StringBuffer();
+            StringBuilder cmd = new StringBuilder(128);
 
             //
             // Add --java_out.
diff --git a/java/demo/book/lifecycle/Parser.java b/java/demo/book/lifecycle/Parser.java
index 3bf9e0965dd..96800a88040 100644
--- a/java/demo/book/lifecycle/Parser.java
+++ b/java/demo/book/lifecycle/Parser.java
@@ -50,7 +50,7 @@ class Parser
     void
     list(Filesystem.DirectoryPrx dir, boolean recursive, int depth)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         for(int i = 0; i < depth; ++i)
         {
             b.append('\t');
diff --git a/java/demo/book/lifecycle/Scanner.java b/java/demo/book/lifecycle/Scanner.java
index 3283176018d..c4c695fcd8b 100644
--- a/java/demo/book/lifecycle/Scanner.java
+++ b/java/demo/book/lifecycle/Scanner.java
@@ -151,7 +151,7 @@ class Scanner
             return null;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
 
         if(c == ';' || c == '\n')
         {
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index a3ab0ac071c..0966b981a3a 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -33,7 +33,8 @@ public class LoggerI implements Logger
     public void
     trace(String category, String message)
     {
-        StringBuffer s = new StringBuffer("[ ");
+        StringBuilder s = new StringBuilder(256);
+        s.append("[ ");
         s.append(_date.format(new java.util.Date()));
         s.append(_time.format(new java.util.Date()));
         s.append(' ');
@@ -48,35 +49,40 @@ public class LoggerI implements Logger
             s.insert(idx + 1, "  ");
             ++idx;
         }
-        System.err.print(s.toString() + _lineSeparator);
+        s.append(_lineSeparator);
+        System.err.print(s.toString());
     }
 
     public void
     warning(String message)
     {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(256);
         s.append(_date.format(new java.util.Date()));
         s.append(_time.format(new java.util.Date()));
         s.append(' ');
         s.append(_prefix);
         s.append("warning: ");
-        s.append(Thread.currentThread().getName() + ": ");
+        s.append(Thread.currentThread().getName());
+        s.append(": ");
         s.append(message);
-        System.err.print(s.toString() + _lineSeparator);
+        s.append(_lineSeparator);
+        System.err.print(s.toString());
     }
 
     public void
     error(String message)
     {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(256);
         s.append(_date.format(new java.util.Date()));
         s.append(_time.format(new java.util.Date()));
         s.append(' ');
         s.append(_prefix);
         s.append("error: ");
-        s.append(Thread.currentThread().getName() + ": ");
+        s.append(Thread.currentThread().getName());
+        s.append(": ");
         s.append(message);
-        System.err.print(s.toString() + _lineSeparator);
+        s.append(_lineSeparator);
+        System.err.print(s.toString());
     }
 
     String _prefix = "";
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 0c1d31c38da..d56a8fe7a28 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1219,8 +1219,10 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't update object adapter `");
+                    s.append(_id);
+                    s.append("' endpoints with the locator registry:\n");
                     s.append("the object adapter is not known to the locator registry");
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
@@ -1234,9 +1236,13 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
-                    s.append("the replica group `" + _replicaGroupId + "' is not known to the locator registry");
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't update object adapter `");
+                    s.append(_id);
+                    s.append("' endpoints with the locator registry:\n");
+                    s.append("the replica group `");
+                    s.append(_replicaGroupId);
+                    s.append("' is not known to the locator registry");
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
 
@@ -1249,8 +1255,10 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't update object adapter `");
+                    s.append(_id);
+                    s.append("' endpoints with the locator registry:\n");
                     s.append("the object adapter endpoints are already set");
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
@@ -1263,8 +1271,11 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n" + e);
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't update object adapter `");
+                    s.append(_id);
+                    s.append("' endpoints with the locator registry:\n");
+                    s.append(e.toString());
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
                 throw e; // TODO: Shall we raise a special exception instead of a non obvious local exception?
@@ -1272,8 +1283,10 @@ public final class ObjectAdapterI implements ObjectAdapter
 
             if(_instance.traceLevels().location >= 1)
             {
-                StringBuffer s = new StringBuffer();
-                s.append("updated object adapter `" + _id + "' endpoints with the locator registry\n");
+                StringBuilder s = new StringBuilder(128);
+                s.append("updated object adapter `");
+                s.append(_id);
+                s.append("' endpoints with the locator registry\n");
                 s.append("endpoints = ");
                 if(proxy != null)
                 {
@@ -1311,8 +1324,10 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't register server `" + serverId + "' with the locator registry:\n");
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't register server `");
+                    s.append(serverId);
+                    s.append("' with the locator registry:\n");
                     s.append("the server is not known to the locator registry");
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
@@ -1326,17 +1341,22 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_instance.traceLevels().location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("couldn't register server `" + serverId + "' with the locator registry:\n" + ex);
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("couldn't register server `");
+                    s.append(serverId);
+                    s.append("' with the locator registry:\n");
+                    s.append(ex.toString());
                     _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
                 }
-                throw ex; // TODO: Shall we raise a special exception instead of a non obvious local exception?
+                throw ex; // TODO: Shall we raise a special exception instead of a non-obvious local exception?
             }
 
             if(_instance.traceLevels().location >= 1)
             {
-                StringBuffer s = new StringBuffer();
-                s.append("registered server `" + serverId + "' with the locator registry");
+                StringBuilder s = new StringBuilder(128);
+                s.append("registered server `");
+                s.append(serverId);
+                s.append("' with the locator registry");
                 _instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.toString());
             }
         }
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 2541478d1d6..3b99fa17b69 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -2403,7 +2403,7 @@ public class BasicStream
             throw new Ice.MarshalException();
         }
 
-        StringBuffer buf = new StringBuffer(id.length());
+        StringBuilder buf = new StringBuilder(id.length());
 
         int start = 2;
         boolean done = false;
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 1764476cf1d..67dbc3bd5b8 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -453,8 +453,10 @@ public final class Instance
                 {
                     if(_traceLevels.location >= 1)
                     {
-                        StringBuffer s = new StringBuffer();
-                        s.append("couldn't register server `" + serverId + "' with the locator registry:\n");
+                        StringBuilder s = new StringBuilder(128);
+                        s.append("couldn't register server `");
+                        s.append(serverId);
+                        s.append("' with the locator registry:\n");
                         s.append("the server is not known to the locator registry");
                         _initData.logger.trace(_traceLevels.locationCat, s.toString());
                     }
@@ -465,8 +467,11 @@ public final class Instance
                 {
                     if(_traceLevels.location >= 1)
                     {
-                        StringBuffer s = new StringBuffer();
-                        s.append("couldn't register server `" + serverId + "' with the locator registry:\n" + ex);
+                        StringBuilder s = new StringBuilder(128);
+                        s.append("couldn't register server `");
+                        s.append(serverId);
+                        s.append("' with the locator registry:\n");
+                        s.append(ex.toString());
                         _initData.logger.trace(_traceLevels.locationCat, s.toString());
                     }
                     throw ex;
@@ -474,8 +479,10 @@ public final class Instance
 
                 if(_traceLevels.location >= 1)
                 {
-                    StringBuffer s = new StringBuffer();
-                    s.append("registered server `" + serverId + "' with the locator registry");
+                    StringBuilder s = new StringBuilder(128);
+                    s.append("registered server `");
+                    s.append(serverId);
+                    s.append("' with the locator registry");
                     _initData.logger.trace(_traceLevels.locationCat, s.toString());
                 }
             }
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index bcf28e5865d..cfb06e9d0e7 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -545,15 +545,20 @@ public final class LocatorInfo
     {
         assert(ref.isIndirect());
 
-        StringBuffer s = new StringBuffer();
-        s.append(msg + "\n");
+        StringBuilder s = new StringBuilder(128);
+        s.append(msg);
+        s.append("\n");
         if(!ref.isWellKnown())
         {
-            s.append("adapter = " + ref.getAdapterId() + "\n");
+            s.append("adapter = ");
+            s.append(ref.getAdapterId());
+            s.append("\n");
         }
         else
         {
-            s.append("object = " + ref.getInstance().identityToString(ref.getIdentity()) + "\n");
+            s.append("object = ");
+            s.append(ref.getInstance().identityToString(ref.getIdentity()));
+            s.append("\n");
         }
 
         s.append("endpoints = ");
@@ -584,9 +589,10 @@ public final class LocatorInfo
             final Instance instance = ref.getInstance();
             if(instance.traceLevels().location >= 1)
             {
-                StringBuffer s = new StringBuffer();
+                StringBuilder s = new StringBuilder(128);
                 s.append("adapter not found\n");
-                s.append("adapter = " + ref.getAdapterId());
+                s.append("adapter = ");
+                s.append(ref.getAdapterId());
                 instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
             }
 
@@ -600,9 +606,10 @@ public final class LocatorInfo
             final Instance instance = ref.getInstance();
             if(instance.traceLevels().location >= 1)
             {
-                StringBuffer s = new StringBuffer();
+                StringBuilder s = new StringBuilder(128);
                 s.append("object not found\n");
-                s.append("object = " + instance.identityToString(ref.getIdentity()));
+                s.append("object = ");
+                s.append(instance.identityToString(ref.getIdentity()));
                 instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
             }
 
@@ -620,15 +627,19 @@ public final class LocatorInfo
             final Instance instance = ref.getInstance();
             if(instance.traceLevels().location >= 1)
             {
-                StringBuffer s = new StringBuffer();
+                StringBuilder s = new StringBuilder(128);
                 s.append("couldn't contact the locator to retrieve adapter endpoints\n");
                 if(ref.getAdapterId().length() > 0)
                 {
-                    s.append("adapter = " + ref.getAdapterId() + "\n");
+                    s.append("adapter = ");
+                    s.append(ref.getAdapterId());
+                    s.append("\n");
                 }
                 else
                 {
-                    s.append("object = " + instance.identityToString(ref.getIdentity()) + "\n");
+                    s.append("object = ");
+                    s.append(instance.identityToString(ref.getIdentity()));
+                    s.append("\n");
                 }
                 s.append("reason = " + ex);
                 instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
@@ -658,17 +669,21 @@ public final class LocatorInfo
         else
         {
             final Instance instance = ref.getInstance();
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder(128);
             s.append("no endpoints configured for ");
             if(ref.getAdapterId().length() > 0)
             {
                 s.append("adapter\n");
-                s.append("adapter = " + ref.getAdapterId() + "\n");
+                s.append("adapter = ");
+                s.append(ref.getAdapterId());
+                s.append("\n");
             }
             else
             {
                 s.append("object\n");
-                s.append("object = " + instance.identityToString(ref.getIdentity()) + "\n");
+                s.append("object = ");
+                s.append(instance.identityToString(ref.getIdentity()));
+                s.append("\n");
             }
             instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
         }
@@ -680,8 +695,9 @@ public final class LocatorInfo
         if(ref.getInstance().traceLevels().location >= 1)
         {
             Instance instance = ref.getInstance();
-            StringBuffer s = new StringBuffer();
-            s.append("searching for adapter by id\nadapter=");
+            StringBuilder s = new StringBuilder(128);
+            s.append("searching for adapter by id\n");
+            s.append("adapter = ");
             s.append(ref.getAdapterId());
             instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
         }
@@ -702,8 +718,9 @@ public final class LocatorInfo
         if(ref.getInstance().traceLevels().location >= 1)
         {
             Instance instance = ref.getInstance();
-            StringBuffer s = new StringBuffer();
-            s.append("searching for object by id\nobject = ");
+            StringBuilder s = new StringBuilder(128);
+            s.append("searching for object by id\n");
+            s.append("object = ");
             s.append(instance.identityToString(ref.getIdentity()));
             instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString());
         }
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index b3d9823730c..278696d91dc 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -1143,7 +1143,7 @@ public final class Network
     public static String
     addressesToString(java.net.InetAddress localAddr, int localPort, java.net.InetAddress remoteAddr, int remotePort)
     {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(128);
         s.append("local address = ");
         s.append(localAddr.getHostAddress());
         s.append(':');
@@ -1166,7 +1166,7 @@ public final class Network
     public static String
     addrToString(java.net.InetSocketAddress addr)
     {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(128);
         s.append(addr.getAddress().getHostAddress());
         s.append(':');
         s.append(addr.getPort());
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 0a5bdec8c86..d9531028cdd 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -853,7 +853,7 @@ public final class OutgoingConnectionFactory
         TraceLevels traceLevels = _instance.traceLevels();
         if(traceLevels.retry >= 2)
         {
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder(128);
             s.append("connection to endpoint failed");
             if(ex instanceof Ice.CommunicatorDestroyedException)
             {
@@ -913,7 +913,7 @@ public final class OutgoingConnectionFactory
         TraceLevels traceLevels = _instance.traceLevels();
         if(traceLevels.retry >= 2)
         {
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder(128);
             s.append("couldn't resolve endpoint host");
             if(ex instanceof Ice.CommunicatorDestroyedException)
             {
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 7e9a8acc4d2..037b5508cac 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -257,7 +257,7 @@ public abstract class Reference implements Cloneable
         // these features. Please review for all features that depend on the
         // format of proxyToString() before changing this and related code.
         //
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(128);
 
         //
         // If the encoded identity string contains characters which
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index 2e84f1bb2d7..1f17b9cb854 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -280,7 +280,7 @@ public class RoutableReference extends Reference
         // these features. Please review for all features that depend on the
         // format of proxyToString() before changing this and related code.
         //
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder(128);
         s.append(super.toString());
         if(_endpoints.length > 0)
         {
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index b4eec68879d..3fdaaa862f2 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -710,11 +710,12 @@ class Instance
 
         if(_securityTraceLevel >= 1)
         {
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder(128);
             s.append("enabling SSL ciphersuites:");
             for(int i = 0; i < cipherSuites.length; ++i)
             {
-                s.append("\n  " + cipherSuites[i]);
+                s.append("\n  ");
+                s.append(cipherSuites[i]);
             }
             _logger.trace(_securityTraceCategory, s.toString());
         }
@@ -927,14 +928,15 @@ class Instance
                     //
                     if(!certNameOK && (_checkCertName || (_securityTraceLevel >= 1 && _verifier == null)))
                     {
-                        StringBuffer sb = new StringBuffer();
+                        StringBuilder sb = new StringBuilder(128);
                         sb.append("IceSSL: ");
                         if(!_checkCertName)
                         {
                             sb.append("ignoring ");
                         }
-                        sb.append("certificate validation failure:\npeer certificate does not contain `" +
-                                  address + "' in its subjectAltName extension");
+                        sb.append("certificate validation failure:\npeer certificate does not contain `");
+                        sb.append(address);
+                        sb.append("' in its subjectAltName extension");
                         if(!dnsNames.isEmpty())
                         {
                             sb.append("\nDNS names found in certificate: ");
diff --git a/java/src/IceUtilInternal/Base64.java b/java/src/IceUtilInternal/Base64.java
index 8a06de57f76..ae8211bafee 100644
--- a/java/src/IceUtilInternal/Base64.java
+++ b/java/src/IceUtilInternal/Base64.java
@@ -20,12 +20,11 @@ encode(byte[] plainSeq)
         return "";
     }
 
-    StringBuffer retval = new StringBuffer();
     int base64Bytes = (((plainSeq.length * 4) / 3) + 1);
     int newlineBytes = (((base64Bytes * 2) / 76) + 1);
     int totalBytes = base64Bytes + newlineBytes;
 
-    retval.ensureCapacity(totalBytes);
+    StringBuilder retval = new StringBuilder(totalBytes);
  
     int by1;
     int by2;
@@ -78,8 +77,7 @@ encode(byte[] plainSeq)
         }
     }
 
-    StringBuffer outString = new StringBuffer();
-    outString.ensureCapacity(totalBytes);
+    StringBuilder outString = new StringBuilder(totalBytes);
     int iter = 0;
 
     while((retval.length() - iter) > 76)
@@ -97,9 +95,7 @@ encode(byte[] plainSeq)
 public static byte[]
 decode(String str)
 {
-    StringBuffer newStr = new StringBuffer();
-
-    newStr.ensureCapacity(str.length());
+    StringBuilder newStr = new StringBuilder(str.length());
 
     for(int j = 0; j < str.length(); j++)
     {
diff --git a/java/src/IceUtilInternal/Options.java b/java/src/IceUtilInternal/Options.java
index 7751443e594..fb1d4f9e7d9 100644
--- a/java/src/IceUtilInternal/Options.java
+++ b/java/src/IceUtilInternal/Options.java
@@ -37,7 +37,7 @@ public final class Options
 
         int state = NormalState;
 
-        StringBuffer arg = new StringBuffer();
+        StringBuilder arg = new StringBuilder(128);
         java.util.List<String> vec = new java.util.ArrayList<String>();
 
         for(int i = 0; i < line.length(); ++i)
@@ -113,7 +113,7 @@ public final class Options
                     if(IFS.indexOf(line.charAt(i)) != -1)
                     {
                         vec.add(arg.toString());
-                        arg = new StringBuffer();
+                        arg = new StringBuilder(128);
                         
                         //
                         // Move to start of next argument.
diff --git a/java/src/IceUtilInternal/StringUtil.java b/java/src/IceUtilInternal/StringUtil.java
index 236e3c64b0a..9ff9d80cfd2 100644
--- a/java/src/IceUtilInternal/StringUtil.java
+++ b/java/src/IceUtilInternal/StringUtil.java
@@ -82,7 +82,7 @@ public final class StringUtil
     // characters, b is preceded by a backslash in sb.
     //
     private static void
-    encodeChar(byte b, StringBuffer sb, String special)
+    encodeChar(byte b, StringBuilder sb, String special)
     {
         switch(b)
         {
@@ -189,7 +189,7 @@ public final class StringUtil
             return null;
         }
 
-        StringBuffer result = new StringBuffer(bytes.length);
+        StringBuilder result = new StringBuilder(bytes.length);
         for(int i = 0; i < bytes.length; i++)
         {
             encodeChar(bytes[i], result, special);
@@ -313,7 +313,7 @@ public final class StringUtil
     // Return true if successful, false otherwise.
     //
     private static void
-    decodeString(String s, int start, int end, StringBuffer sb)
+    decodeString(String s, int start, int end, StringBuilder sb)
     {
         Ice.IntHolder nextStart = new Ice.IntHolder();
         while(start < end)
@@ -344,7 +344,7 @@ public final class StringUtil
 
         try
         {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder(end - start);
             decodeString(s, start, end, sb);
             String decodedString = sb.toString();
 
diff --git a/java/src/ant/Slice2FreezeJTask.java b/java/src/ant/Slice2FreezeJTask.java
index 139230ff3ae..e88d1256f77 100644
--- a/java/src/ant/Slice2FreezeJTask.java
+++ b/java/src/ant/Slice2FreezeJTask.java
@@ -182,20 +182,24 @@ public class Slice2FreezeJTask extends SliceTask
         // Add the --dict options.
         //
         p = _dicts.iterator();
-        StringBuffer dictString = new StringBuffer();
+        StringBuilder dictString = new StringBuilder(128);
         while(p.hasNext())
         {
             Dict d = (Dict)p.next();
 
             dictString.append(" --dict ");
-            dictString.append(d.getName() + "," + d.getKey() + "," + d.getValue());
+            dictString.append(d.getName());
+            dictString.append(",");
+            dictString.append(d.getKey());
+            dictString.append(",");
+            dictString.append(d.getValue());
         }
 
         //
         // Add the --dict-index options.
         //
         p = _dictIndices.iterator();
-        StringBuffer dictIndexString = new StringBuffer();
+        StringBuilder dictIndexString = new StringBuilder(128);
         while(p.hasNext())
         {
             Dictindex d = (Dictindex)p.next();
@@ -204,11 +208,12 @@ public class Slice2FreezeJTask extends SliceTask
             dictIndexString.append(d.getName());
             if(d.getMember() != null)
             {
-                dictIndexString.append("," + d.getMember());
+                dictIndexString.append(",");
+                dictIndexString.append(d.getMember());
             }
             if(d.getCasesensitive() == false)
             {
-                dictIndexString.append("," + "case-insensitive");
+                dictIndexString.append(",case-insensitive");
             }
         }
         
@@ -216,16 +221,20 @@ public class Slice2FreezeJTask extends SliceTask
         // Add the --index options.
         //
         p = _indices.iterator();
-        StringBuffer indexString = new StringBuffer();
+        StringBuilder indexString = new StringBuilder();
         while(p.hasNext())
         {
             Index i = (Index)p.next();
 
             indexString.append(" --index ");
-            indexString.append(i.getName() + "," + i.getType() + "," + i.getMember());
+            indexString.append(i.getName());
+            indexString.append(",");
+            indexString.append(i.getType());
+            indexString.append(",");
+            indexString.append(i.getMember());
             if(i.getCasesensitive() == false)
             {
-                indexString.append("," + "case-insensitive");
+                indexString.append(",case-insensitive");
             }
         }
 
@@ -238,7 +247,7 @@ public class Slice2FreezeJTask extends SliceTask
         //
         // Run the translator
         //
-        StringBuffer cmd = new StringBuffer();
+        StringBuilder cmd = new StringBuilder(256);
 
         //
         // Add --ice
@@ -379,7 +388,8 @@ public class Slice2FreezeJTask extends SliceTask
         //      
         if(!sliceFiles.isEmpty())
         {
-            cmd = new StringBuffer("--depend");
+            cmd = new StringBuilder(256);
+            cmd.append("--depend");
             
             //
             // Add include directives
@@ -392,7 +402,9 @@ public class Slice2FreezeJTask extends SliceTask
                     cmd.append(" -I");
                     if(dirs[i].indexOf(' ') != -1)
                     {
-                        cmd.append('"' + dirs[i] + '"');
+                        cmd.append('"');
+                        cmd.append(dirs[i]);
+                        cmd.append('"');
                     }
                     else
                     {
@@ -427,7 +439,9 @@ public class Slice2FreezeJTask extends SliceTask
                 String s = f.toString();
                 if(s.indexOf(' ') != -1)
                 {
-                    cmd.append('"' + s + '"');
+                    cmd.append('"');
+                    cmd.append(s);
+                    cmd.append('"');
                 }
                 else
                 {
diff --git a/java/src/ant/Slice2JavaTask.java b/java/src/ant/Slice2JavaTask.java
index a55b2ddf6aa..09f3b07e797 100644
--- a/java/src/ant/Slice2JavaTask.java
+++ b/java/src/ant/Slice2JavaTask.java
@@ -175,7 +175,7 @@ public class Slice2JavaTask extends SliceTask
                 translator = _translator.toString();
             }
 
-            StringBuffer cmd = new StringBuffer();
+            StringBuilder cmd = new StringBuilder(256);
 
             //
             // Add --output-dir
@@ -197,7 +197,9 @@ public class Slice2JavaTask extends SliceTask
                     cmd.append(" -I");
                     if(dirs[i].indexOf(' ') != -1)
                     {
-                        cmd.append('"' + dirs[i] + '"');
+                        cmd.append('"');
+                        cmd.append(dirs[i]);
+                        cmd.append('"');
                     }
                     else
                     {
@@ -239,7 +241,8 @@ public class Slice2JavaTask extends SliceTask
             //
             if(_checksum != null && _checksum.length() > 0)
             {
-                cmd.append(" --checksum " + _checksum);
+                cmd.append(" --checksum ");
+                cmd.append(_checksum);
             }
 
             //
@@ -259,7 +262,8 @@ public class Slice2JavaTask extends SliceTask
                 while(i.hasNext())
                 {
                     SliceMeta m = (SliceMeta)i.next();
-                    cmd.append(" --meta " + m.getValue());
+                    cmd.append(" --meta ");
+                    cmd.append(m.getValue());
                 }
             }
 
@@ -289,7 +293,9 @@ public class Slice2JavaTask extends SliceTask
                 String s = f.toString();
                 if(s.indexOf(' ') != -1)
                 {
-                    cmd.append('"' + s + '"');
+                    cmd.append('"');
+                    cmd.append(s);
+                    cmd.append('"');
                 }
                 else
                 {
@@ -312,7 +318,8 @@ public class Slice2JavaTask extends SliceTask
             //
             // Update the dependencies.
             //
-            cmd = new StringBuffer("--depend");
+            cmd = new StringBuilder(256);
+            cmd.append("--depend");
 
             //
             // Add include directives
@@ -325,7 +332,9 @@ public class Slice2JavaTask extends SliceTask
                     cmd.append(" -I");
                     if(dirs[i].indexOf(' ') != -1)
                     {
-                        cmd.append('"' + dirs[i] + '"');
+                        cmd.append('"');
+                        cmd.append(dirs[i]);
+                        cmd.append('"');
                     }
                     else
                     {
@@ -344,7 +353,9 @@ public class Slice2JavaTask extends SliceTask
                 String s = f.toString();
                 if(s.indexOf(' ') != -1)
                 {
-                    cmd.append('"' + s + '"');
+                    cmd.append('"');
+                    cmd.append(s);
+                    cmd.append('"');
                 }
                 else
                 {
diff --git a/java/src/ant/SliceTask.java b/java/src/ant/SliceTask.java
index 9edc75b9f84..a778eb6c13a 100644
--- a/java/src/ant/SliceTask.java
+++ b/java/src/ant/SliceTask.java
@@ -213,7 +213,7 @@ public class SliceTask extends org.apache.tools.ant.Task
         try
         {
             BufferedReader in = new BufferedReader(new StringReader(allDependencies));
-            StringBuffer depline = new StringBuffer();
+            StringBuilder depline = new StringBuilder(1024);
             String line;
 
             while((line = in.readLine()) != null)
@@ -261,7 +261,7 @@ public class SliceTask extends org.apache.tools.ant.Task
                     // (e.g., "C\:/Program\ Files/...").
                     //
                     java.util.ArrayList l = new java.util.ArrayList();
-                    StringBuffer file = new StringBuffer();
+                    StringBuilder file = new StringBuilder(128);
                     pos = 0;
                     while(pos < chars.length)
                     {
@@ -270,7 +270,7 @@ public class SliceTask extends org.apache.tools.ant.Task
                             if(file.length() > 0)
                             {
                                 l.add(file.toString());
-                                file = new StringBuffer();
+                                file = new StringBuilder(128);
                             }
                         }
                         else if(chars[pos] != '\\') // Skip backslash of an escaped character.
@@ -301,7 +301,7 @@ public class SliceTask extends org.apache.tools.ant.Task
                     }
                     dependencies.add(depend);
 
-                    depline = new StringBuffer();
+                    depline = new StringBuilder(1024);
                 }
             }
         }
diff --git a/java/test/Freeze/complex/Parser.java b/java/test/Freeze/complex/Parser.java
index c654fa371e6..8f4f7e4ec4d 100644
--- a/java/test/Freeze/complex/Parser.java
+++ b/java/test/Freeze/complex/Parser.java
@@ -128,7 +128,7 @@ public class Parser
             return;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
         
         //
         // Get the next character
diff --git a/java/test/Ice/protobuf/ant/ProtocTask.java b/java/test/Ice/protobuf/ant/ProtocTask.java
index ba981a27db0..d1ea695bbb4 100644
--- a/java/test/Ice/protobuf/ant/ProtocTask.java
+++ b/java/test/Ice/protobuf/ant/ProtocTask.java
@@ -174,7 +174,7 @@ public class ProtocTask extends org.apache.tools.ant.Task
                 translator = _translator.toString();
             }
 
-            StringBuffer cmd = new StringBuffer();
+            StringBuilder cmd = new StringBuilder(128);
 
             //
             // Add --java_out.
@@ -204,7 +204,9 @@ public class ProtocTask extends org.apache.tools.ant.Task
                 String s = stripDriveLetter(f.toString());
                 if(s.indexOf(' ') != -1)
                 {
-                    cmd.append('"' + s + '"');
+                    cmd.append('"');
+                    cmd.append(s);
+                    cmd.append('"');
                 }
                 else
                 {