Fixed performance issues reported by FindBugs. Made corresponding

changes for C# where applicable.

23 files changed, 183 insertions, 147 deletions

diff --git a/cs/src/Ice/BasicStream.cs b/cs/src/Ice/BasicStream.cs
index 589e4b1b971..22d4b6a4d43 100644
--- a/cs/src/Ice/BasicStream.cs
+++ b/cs/src/Ice/BasicStream.cs
@@ -489,8 +489,8 @@ namespace IceInternal
                 e.minor = Protocol.encodingMinor;
                 throw e;
             }
-            _readEncapsStack.encodingMajor = eMajor;
-            _readEncapsStack.encodingMinor = eMinor;
+            // _readEncapsStack.encodingMajor = eMajor; // Currently unused
+            // _readEncapsStack.encodingMinor = eMinor; // Currently unused
         }
 
         public virtual void endReadEncaps()
@@ -2126,7 +2126,7 @@ namespace IceInternal
             }
 
             string mostDerivedId = readTypeId();
-            string id = string.Copy(mostDerivedId);
+            string id = mostDerivedId;
 
             while(true)
             {
@@ -2879,8 +2879,8 @@ namespace IceInternal
             internal int start;
             internal int sz;
 
-            internal byte encodingMajor;
-            internal byte encodingMinor;
+            // internal byte encodingMajor; // Currently unused
+            // internal byte encodingMinor; // Currently unused
 
             internal Hashtable patchMap;
             internal Hashtable unmarshaledMap;
diff --git a/cs/src/Ice/Instance.cs b/cs/src/Ice/Instance.cs
index 40284cd61b4..4bbb37b9a21 100644
--- a/cs/src/Ice/Instance.cs
+++ b/cs/src/Ice/Instance.cs
@@ -13,6 +13,7 @@ namespace IceInternal
     using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Text;
 
     public sealed class Instance
     {
@@ -1054,12 +1055,13 @@ namespace IceInternal
                 ArrayList unusedProperties = ((Ice.PropertiesI)_initData.properties).getUnusedProperties();
                 if(unusedProperties.Count != 0)
                 {
-                    string message = "The following properties were set but never read:";
+                    StringBuilder message = new StringBuilder("The following properties were set but never read:");
                     foreach(string s in unusedProperties)
                     {
-                        message += "\n    " + s;
+                        message.Append("\n    ");
+			message.Append(s);
                     }
-                    _initData.logger.warning(message);
+                    _initData.logger.warning(message.ToString());
                 }
             }
 
diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs
index 09ceda15677..8c034014070 100644
--- a/cs/src/Ice/ObjectAdapterI.cs
+++ b/cs/src/Ice/ObjectAdapterI.cs
@@ -13,6 +13,7 @@ namespace Ice
     using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Text;
 
     public sealed class ObjectAdapterI : ObjectAdapter
     {
@@ -788,12 +789,15 @@ namespace Ice
             //
             if(unknownProps.Count != 0 && properties.getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0)
             {
-                string message = "found unknown properties for object adapter `" + _name + "':";
+                StringBuilder message = new StringBuilder("found unknown properties for object adapter `");
+		message.Append(_name);
+		message.Append("':");
                 foreach(string s in unknownProps)
                 {
-                    message += "\n    " + s;
+                    message.Append("\n    ");
+		    message.Append(s);
                 }
-                instance_.initializationData().logger.warning(message);
+                instance_.initializationData().logger.warning(message.ToString());
             }
 
             //
@@ -1188,18 +1192,20 @@ namespace Ice
 
             if(instance_.traceLevels().network >= 3)
              {
-                 string s = "published endpoints for object adapter `" + _name + "':\n";
+                 StringBuilder s = new StringBuilder("published endpoints for object adapter `");
+		 s.Append(_name);
+		 s.Append("':\n");
                  bool first = true;
                  foreach(IceInternal.EndpointI endpoint in endpoints)
                  {
                      if(!first)
                      {
-                         s += ":";
+                         s.Append(":");
                      }
-                     s += endpoint.ToString();
+                     s.Append(endpoint.ToString());
                      first = false;
                  }
-                 instance_.initializationData().logger.trace(instance_.traceLevels().networkCat, s);
+                 instance_.initializationData().logger.trace(instance_.traceLevels().networkCat, s.ToString());
              }
              return endpoints;
         }
diff --git a/cs/src/Ice/ReferenceFactory.cs b/cs/src/Ice/ReferenceFactory.cs
index febd55a6cf3..a8cffe26514 100644
--- a/cs/src/Ice/ReferenceFactory.cs
+++ b/cs/src/Ice/ReferenceFactory.cs
@@ -10,6 +10,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 
 namespace IceInternal
 {
@@ -423,13 +424,15 @@ namespace IceInternal
                         instance_.initializationData().properties.getPropertyAsIntWithDefault(
                                                                                 "Ice.Warn.Endpoints", 1) > 0)
                 {
-                    string msg = "Proxy contains unknown endpoints:";
+                    StringBuilder msg = new StringBuilder("Proxy contains unknown endpoints:");
                     int sz = unknownEndpoints.Count;
                     for(int idx = 0; idx < sz; ++idx)
                     {
-                        msg += " `" + (string)unknownEndpoints[idx] + "'";
+                        msg.Append(" `");
+			msg.Append((string)unknownEndpoints[idx]);
+			msg.Append("'");
                     }
-                    instance_.initializationData().logger.warning(msg);
+                    instance_.initializationData().logger.warning(msg.ToString());
                 }
 
                 EndpointI[] ep = (EndpointI[])endpoints.ToArray(typeof(EndpointI));
@@ -674,12 +677,15 @@ namespace IceInternal
 
             if(unknownProps.Count != 0)
             {
-                string message = "found unknown properties for proxy '" + prefix + "':";
+                StringBuilder message = new StringBuilder("found unknown properties for proxy '");
+		message.Append(prefix);
+		message.Append("':");
                 foreach(string s in unknownProps)
                 {
-                    message += "\n    " + s;
+                    message.Append("\n    ");
+		    message.Append(s);
                 }
-                instance_.initializationData().logger.warning(message);
+                instance_.initializationData().logger.warning(message.ToString());
             }
         }
 
diff --git a/cs/src/Ice/TcpAcceptor.cs b/cs/src/Ice/TcpAcceptor.cs
index e1969e497b6..9991a9f6480 100644
--- a/cs/src/Ice/TcpAcceptor.cs
+++ b/cs/src/Ice/TcpAcceptor.cs
@@ -15,6 +15,7 @@ namespace IceInternal
     using System.Diagnostics;
     using System.Net;
     using System.Net.Sockets;
+    using System.Text;
 
     class TcpAcceptor : Acceptor
     {
@@ -51,27 +52,28 @@ namespace IceInternal
 
             if(_traceLevels.network >= 1)
             {
-                string s = "accepting tcp connections at " + ToString();
+                StringBuilder s = new StringBuilder("accepting tcp connections at ");
+		s.Append(ToString());
                 if(_traceLevels.network >= 3)
                 {
                     List<string> interfaces =
                         Network.getHostsForEndpointExpand(_addr.Address.ToString(), instance_.protocolSupport(), true);
                     if(interfaces.Count != 0)
                     {
-                        s += "\nlocal interfaces: ";
+                        s.Append("\nlocal interfaces: ");
                         bool first = true;
                         foreach(string iface in interfaces)
                         {
                             if(!first)
                             {
-                                s += ", ";
+                                s.Append(", ");
                             }
-                            s += iface;
+                            s.Append(iface);
                             first = false;
                         }
                     }
                 }
-                _logger.trace(_traceLevels.networkCat, s);
+                _logger.trace(_traceLevels.networkCat, s.ToString());
             }
         }
 
diff --git a/cs/src/Ice/UdpTransceiver.cs b/cs/src/Ice/UdpTransceiver.cs
index e86c44c8eb3..0751a07e44d 100644
--- a/cs/src/Ice/UdpTransceiver.cs
+++ b/cs/src/Ice/UdpTransceiver.cs
@@ -16,6 +16,7 @@ namespace IceInternal
     using System.Net;
     using System.Net.Sockets;
     using System.Threading;
+    using System.Text;
 
     sealed class UdpTransceiver : Transceiver
     {
@@ -635,27 +636,28 @@ namespace IceInternal
 
                 if(_traceLevels.network >= 1)
                 {
-                    string s = "starting to receive udp packets\n" + ToString();
+                    StringBuilder s = new StringBuilder("starting to receive udp packets\n");
+		    s.Append(ToString());
                     if(_traceLevels.network >= 3)
                     {
                         List<string> interfaces =
                             Network.getHostsForEndpointExpand(_addr.Address.ToString(), _protocolSupport, true);
                         if(interfaces.Count != 0)
                         {
-                            s += "\nlocal interfaces: ";
+                            s.Append("\nlocal interfaces: ");
                             bool first = true;
                             foreach(string iface in interfaces)
                             {
                                 if(!first)
                                 {
-                                    s += ", ";
+				    s.Append(", ");
                                 }
-                                s += iface;
+                                s.Append(iface);
                                 first = false;
                             }
                         }
                     }
-                    _logger.trace(_traceLevels.networkCat, s);
+                    _logger.trace(_traceLevels.networkCat, s.ToString());
                 }
             }
             catch(Ice.LocalException)
diff --git a/cs/src/IceSSL/AcceptorI.cs b/cs/src/IceSSL/AcceptorI.cs
index bd4922fd421..142f1a0c748 100644
--- a/cs/src/IceSSL/AcceptorI.cs
+++ b/cs/src/IceSSL/AcceptorI.cs
@@ -17,6 +17,7 @@ namespace IceSSL
     using System.Net.Security;
     using System.Net.Sockets;
     using System.Security.Cryptography.X509Certificates;
+    using System.Text;
 
     class AcceptorI : IceInternal.Acceptor
     {
@@ -53,27 +54,28 @@ namespace IceSSL
 
             if(_instance.networkTraceLevel() >= 1)
             {
-                string s = "accepting ssl connections at " + ToString();
+                StringBuilder s = new StringBuilder("accepting ssl connections at ");
+		s.Append(ToString());
                 if(_instance.networkTraceLevel() >= 3)
                 {
                     List<string> interfaces = IceInternal.Network.getHostsForEndpointExpand(_addr.Address.ToString(),
                                                                                  _instance.protocolSupport(), true);
                     if(interfaces.Count != 0)
                     {
-                        s += "\nlocal interfaces: ";
+                        s.Append("\nlocal interfaces: ");
                         bool first = true;
                         foreach(string iface in interfaces)
                         {
                             if(!first)
                             {
-                                s += ", ";
+                                s.Append(", ");
                             }
-                            s += iface;
+                            s.Append(iface);
                             first = false;
                         }
                     }
                 }
-                _logger.trace(_instance.networkTraceCategory(), s);
+                _logger.trace(_instance.networkTraceCategory(), s.ToString());
             }
         }
 
diff --git a/cs/src/IceSSL/RFC2253.cs b/cs/src/IceSSL/RFC2253.cs
index c2e5d0332af..2771982d1bd 100644
--- a/cs/src/IceSSL/RFC2253.cs
+++ b/cs/src/IceSSL/RFC2253.cs
@@ -15,6 +15,7 @@ namespace IceSSL
     using System;
     using System.Collections;
     using System.Diagnostics;
+    using System.Text;
 
     class RFC2253
     {
@@ -122,13 +123,13 @@ namespace IceSSL
             //
             // Unescape the entire string.
             //
-            string result = "";
+            StringBuilder result = new StringBuilder();
             if(data[0] == '#')
             {
                 int pos = 1;
                 while(pos < data.Length)
                 {
-                    result += unescapeHex(data, pos);
+                    result.Append(unescapeHex(data, pos));
                     pos += 2;
                 }
             }
@@ -139,7 +140,7 @@ namespace IceSSL
                 {
                     if(data[pos] != '\\')
                     {
-                        result += data[pos];
+                        result.Append(data[pos]);
                         ++pos;
                     }
                     else
@@ -151,18 +152,18 @@ namespace IceSSL
                         }
                         if(special.IndexOf(data[pos]) != -1 || data[pos] != '\\' || data[pos] != '"')
                         {
-                            result += data[pos];
+                            result.Append(data[pos]);
                             ++pos;
                             }
                         else
                         {
-                            result += unescapeHex(data, pos);
+                            result.Append(unescapeHex(data, pos));
                             pos += 2;
                         }
                     }
                 }
             }
-            return result;
+            return result.ToString();
         }
         
         private static int
@@ -334,19 +335,19 @@ namespace IceSSL
         parseAttributeValue(string data, ref int pos)
         {
             eatWhite(data, ref pos);
-            string result = "";
             if(pos >= data.Length)
             {
-                return result;
+                return "";
             }
 
             //
             // RFC 2253
             // # hexstring
             //
+            StringBuilder result = new StringBuilder();
             if(data[pos] == '#')
             {
-                result += data[pos];
+                result.Append(data[pos]);
                 ++pos;
                 while(true)
                 {
@@ -355,7 +356,7 @@ namespace IceSSL
                     {
                         break;
                     }
-                    result += h;
+                    result.Append(h);
                 }
             }
             //
@@ -365,7 +366,7 @@ namespace IceSSL
             //
             else if(data[pos] == '"')
             {
-                result += data[pos];
+                result.Append(data[pos]);
                 ++pos;
                 while(true)
                 {
@@ -376,20 +377,20 @@ namespace IceSSL
                     // final terminating "
                     if(data[pos] == '"')
                     {
-                        result += data[pos];
+                        result.Append(data[pos]);
                         ++pos;
                         break;
                     }
                     // any character except '\'
                     else if(data[pos] != '\\')
                     {
-                        result += data[pos];
+                        result.Append(data[pos]);
                         ++pos;
                     }
                     // pair '\'
                     else
                     {
-                        result += parsePair(data, ref pos);
+                        result.Append(parsePair(data, ref pos));
                     }
                 }
             }
@@ -404,11 +405,11 @@ namespace IceSSL
                 {
                     if(data[pos] == '\\')
                     {
-                        result += parsePair(data, ref pos);
+                        result.Append(parsePair(data, ref pos));
                     }
                     else if(special.IndexOf(data[pos]) == -1 && data[pos] != '"')
                     {
-                        result += data[pos];
+                        result.Append(data[pos]);
                         ++pos;
                     }
                     else
@@ -417,7 +418,7 @@ namespace IceSSL
                     }
                 }
             }
-            return result;
+            return result.ToString();
         }
 
         //
diff --git a/cs/src/IceSSL/TrustManager.cs b/cs/src/IceSSL/TrustManager.cs
index ad19665e709..e682783dc4d 100644
--- a/cs/src/IceSSL/TrustManager.cs
+++ b/cs/src/IceSSL/TrustManager.cs
@@ -14,6 +14,7 @@ namespace IceSSL
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Security.Cryptography.X509Certificates;
+    using System.Text;
 
     sealed class TrustManager
     {
@@ -141,13 +142,13 @@ namespace IceSSL
                     {
                         if(traceLevel_ > 0)
                         {
-                            string s = "trust manager matching PDNs:\n";
+                            StringBuilder s = new StringBuilder("trust manager matching PDNs:\n");
                             bool addSemi = false;
                             foreach(ArrayList rdnSet in matchSet)
                             {
                                 if(addSemi)
                                 {
-                                    s += ';';
+                                    s.Append(';');
                                 }
                                 addSemi = true;
                                 bool addComma = false;
@@ -155,15 +156,15 @@ namespace IceSSL
                                 {
                                     if(addComma)
                                     {
-                                        s += ',';
+                                        s.Append(',');
                                     }
                                     addComma = true;
-                                    s += rdn.key;
-                                    s += '=';
-                                    s += rdn.value;
+                                    s.Append(rdn.key);
+                                    s.Append('=');
+                                    s.Append(rdn.value);
                                 }
                             }
-                            communicator_.getLogger().trace("Security", s);
+                            communicator_.getLogger().trace("Security", s.ToString());
                         }
                         if(match(matchSet, dn))
                         {
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index b95a9e3cf5e..03d8ae52309 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -780,12 +780,15 @@ public final class ObjectAdapterI implements ObjectAdapter
         //
         if(unknownProps.size() != 0 && properties.getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0)
         {
-            String message = "found unknown properties for object adapter `" + _name + "':";
+            StringBuffer message = new StringBuffer("found unknown properties for object adapter `");
+	    message.append(_name);
+	    message.append("':");
             for(String p : unknownProps)
             {
-                message += "\n    " + p;
+		message.append("\n    ");
+		message.append(p);
             }
-            _instance.initializationData().logger.warning(message);
+            _instance.initializationData().logger.warning(message.toString());
         }
 
         //
@@ -1173,18 +1176,20 @@ public final class ObjectAdapterI implements ObjectAdapter
 
         if(_instance.traceLevels().network >= 3)
         {
-            String s = "published endpoints for object adapter `" + _name + "':\n";
+            StringBuffer s = new StringBuffer("published endpoints for object adapter `");
+	    s.append(_name);
+	    s.append("':\n");
             boolean first = true;
             for(IceInternal.EndpointI endpoint : endpoints)
             {
                 if(!first)
                 {
-                    s += ":";
+		    s.append(":");
                 }
-                s += endpoint.toString();
+                s.append(endpoint.toString());
                 first = false;
             }
-            _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s);
+            _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s.toString());
         }
         return endpoints;
     }
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 0c97067f201..2ab8f963756 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -11,7 +11,7 @@ package Ice;
 
 public final class PropertiesI implements Properties
 {
-    class PropertyValue
+    static class PropertyValue
     {
         public PropertyValue(PropertyValue v)
         {
diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java
index 69281db127d..c1d03f6b35e 100644
--- a/java/src/Ice/SysLoggerI.java
+++ b/java/src/Ice/SysLoggerI.java
@@ -100,13 +100,13 @@ public final class SysLoggerI implements Logger
     //
     // Syslog facilities facilities (as defined in syslog.h)
     // 
-    private final int LOG_USER = 1;
+    private final static int LOG_USER = 1;
 
     //
     // Syslog priorities (as defined in syslog.h)
     // 
-    private final int LOG_ERR = 3;
-    private final int LOG_WARNING = 4;
-    private final int LOG_INFO = 6;
+    private final static int LOG_ERR = 3;
+    private final static int LOG_WARNING = 4;
+    private final static int LOG_INFO = 6;
 }
 
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 91cd29b2974..19b9cbf82d8 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -442,8 +442,8 @@ public class BasicStream
             e.minor = Protocol.encodingMinor;
             throw e;
         }
-        _readEncapsStack.encodingMajor = eMajor;
-        _readEncapsStack.encodingMinor = eMinor;
+        // _readEncapsStack.encodingMajor = eMajor; // Currently unused
+        // _readEncapsStack.encodingMinor = eMinor; // Currently unused
     }
 
     public void
@@ -645,7 +645,7 @@ public class BasicStream
         }
         else
         {
-            index = new Integer(++_writeEncapsStack.typeIdIndex);
+            index = Integer.valueOf(++_writeEncapsStack.typeIdIndex);
             _writeEncapsStack.typeIdMap.put(id, index);
             writeBool(false);
             writeString(id);
@@ -668,7 +668,7 @@ public class BasicStream
         final boolean isIndex = readBool();
         if(isIndex)
         {
-            index = new Integer(readSize());
+            index = Integer.valueOf(readSize());
             id = _readEncapsStack.typeIdMap.get(index);
             if(id == null)
             {
@@ -678,7 +678,7 @@ public class BasicStream
         else
         {
             id = readString();
-            index = new Integer(++_readEncapsStack.typeIdIndex);
+            index = Integer.valueOf(++_readEncapsStack.typeIdIndex);
             _readEncapsStack.typeIdMap.put(index, id);
         }
         return id;
@@ -1433,7 +1433,7 @@ public class BasicStream
                     // create a new index, and insert it into the
                     // to-be-marshaled map.
                     //
-                    q = new Integer(++_writeEncapsStack.writeIndex);
+                    q = Integer.valueOf(++_writeEncapsStack.writeIndex);
                     _writeEncapsStack.toBeMarshaledMap.put(v, q);
                 }
                 p = q;
@@ -1483,7 +1483,7 @@ public class BasicStream
 
             if(index < 0)
             {
-                Integer i = new Integer(-index);
+                Integer i = Integer.valueOf(-index);
                 java.util.LinkedList<Patcher> patchlist = _readEncapsStack.patchMap.get(i);
                 if(patchlist == null)
                 {
@@ -1510,7 +1510,7 @@ public class BasicStream
         }
 
         String mostDerivedId = readTypeId();
-        String id = new String(mostDerivedId);
+        String id = mostDerivedId;
 
         while(true)
         {
@@ -1588,7 +1588,7 @@ public class BasicStream
                 }
             }
 
-            Integer i = new Integer(index);
+            Integer i = Integer.valueOf(index);
             _readEncapsStack.unmarshaledMap.put(i, v);
 
             //
@@ -2012,7 +2012,7 @@ public class BasicStream
             //
             bos.write((int)'B');
             bos.write((int)'Z');
-            java.lang.Object[] args = new java.lang.Object[]{ bos, new Integer(compressionLevel) };
+            java.lang.Object[] args = new java.lang.Object[]{ bos, Integer.valueOf(compressionLevel) };
             java.io.OutputStream os = (java.io.OutputStream)_bzOutputStreamCtor.newInstance(args);
             os.write(data, offset + headerSize, uncompressedLen);
             os.close();
@@ -2451,8 +2451,8 @@ public class BasicStream
         int start;
         int sz;
 
-        byte encodingMajor;
-        byte encodingMinor;
+        // byte encodingMajor; // Currently unused
+        // byte encodingMinor; // Currently unused
 
         java.util.TreeMap<Integer, java.util.LinkedList<Patcher> > patchMap;
         java.util.TreeMap<Integer, Ice.Object> unmarshaledMap;
diff --git a/java/src/IceInternal/EndpointHostResolver.java b/java/src/IceInternal/EndpointHostResolver.java
index 450097c556e..d9ab1509112 100644
--- a/java/src/IceInternal/EndpointHostResolver.java
+++ b/java/src/IceInternal/EndpointHostResolver.java
@@ -108,7 +108,7 @@ public class EndpointHostResolver
         _queue.clear();
     }
     
-    class ResolveEntry
+    static class ResolveEntry
     {
         String host;
         int port;
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 59788b78067..dbe3ed6a9cb 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -1037,12 +1037,13 @@ public final class Instance
             java.util.List<String> unusedProperties = ((Ice.PropertiesI)_initData.properties).getUnusedProperties();
             if(unusedProperties.size() != 0)
             {
-                String message = "The following properties were set but never read:";
+                StringBuffer message = new StringBuffer("The following properties were set but never read:");
                 for(String p : unusedProperties)
                 {
-                    message += "\n    " + p;
+		    message.append("\n    ");
+		    message.append(p);
                 }
-                _initData.logger.warning(message);
+                _initData.logger.warning(message.toString());
             }
         }
     }
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index 3a88b63f1f3..7ccc7b8fee3 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -17,7 +17,7 @@ public final class LocatorInfo
         void setException(Ice.LocalException ex);
     }
 
-    private class RequestCallback
+    private static class RequestCallback
     {
         public void 
         response(LocatorInfo locatorInfo, Ice.ObjectPrx proxy)
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index 4eaebed5bfc..d329b6249a0 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -418,12 +418,14 @@ public final class ReferenceFactory
             else if(unknownEndpoints.size() != 0 &&
                    _instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Endpoints", 1) > 0)
             {
-                String msg = "Proxy contains unknown endpoints:";
+                StringBuffer msg = new StringBuffer("Proxy contains unknown endpoints:");
                 for(String e : unknownEndpoints)
                 {
-                    msg += " `" + e + "'";
+		    msg.append(" `");
+		    msg.append(e);
+		    msg.append("'");
                 }
-                _instance.initializationData().logger.warning(msg);
+                _instance.initializationData().logger.warning(msg.toString());
             }
 
             EndpointI[] endp = new EndpointI[endpoints.size()];
@@ -687,12 +689,15 @@ public final class ReferenceFactory
 
         if(unknownProps.size() != 0)
         {
-            String message = "found unknown properties for proxy '" + prefix + "':";
+            StringBuffer message = new StringBuffer("found unknown properties for proxy '");
+	    message.append(prefix);
+	    message.append("':");
             for(String s : unknownProps)
             {
-                message += "\n    " + s;
+		message.append("\n    ");
+		message.append(s);
             }
-            _instance.initializationData().logger.warning(message);
+            _instance.initializationData().logger.warning(message.toString());
         }
     }
 
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index e3c4cf8c90d..1ecd024c3c9 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -38,7 +38,8 @@ class TcpAcceptor implements Acceptor
 
         if(_traceLevels.network >= 1)
         {
-            String s = "accepting tcp connections at " + toString();
+            StringBuffer s = new StringBuffer("accepting tcp connections at ");
+	    s.append(toString());
             if(_traceLevels.network >= 3)
             {
                 java.util.List<String> interfaces = 
@@ -46,20 +47,20 @@ class TcpAcceptor implements Acceptor
                                                       _instance.protocolSupport(), true);
                 if(!interfaces.isEmpty())
                 {
-                    s += "\nlocal interfaces: ";
+		    s.append("\nlocal interfaces: ");
                     boolean first = true;
                     for(String iface : interfaces)
                     {
                         if(!first)
                         {
-                            s += ", ";
+			    s.append(", ");
                         }
-                        s += iface;
+                        s.append(iface);
                         first = false;
                     }
                 }
             }
-            _logger.trace(_traceLevels.networkCat, s);
+            _logger.trace(_traceLevels.networkCat, s.toString());
         }
     }
 
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 65a6ebefd3b..e0076beed55 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -345,27 +345,28 @@ final class UdpTransceiver implements Transceiver
 
             if(_traceLevels.network >= 1)
             {
-                String s = "starting to receive udp packets\n" + toString();
+                StringBuffer s = new StringBuffer("starting to receive udp packets\n");
+		s.append(toString());
                 if(_traceLevels.network >= 3)
                 {
                     java.util.List<String> interfaces = 
                         Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _protocolSupport, true);
                     if(!interfaces.isEmpty())
                     {
-                        s += "\nlocal interfaces: ";
+                        s.append("\nlocal interfaces: ");
                         boolean first = true;
                         for(String iface : interfaces)
                         {
                             if(!first)
                             {
-                                s += ", ";
+                                s.append(", ");
                             }
-                            s += iface;
+                            s.append(iface);
                             first = false;
                         }
                     }
                 }
-                _logger.trace(_traceLevels.networkCat, s);
+                _logger.trace(_traceLevels.networkCat, s.toString());
             }
         }
         catch(Ice.LocalException ex)
@@ -502,7 +503,7 @@ final class UdpTransceiver implements Transceiver
                     Class<?>[] types = new Class<?>[]{ Integer.TYPE, Object.class };
                     m = socketImpl.getClass().getDeclaredMethod("setOption", types);
                     m.setAccessible(true);
-                    Object[] args = new Object[]{ new Integer(java.net.SocketOptions.IP_MULTICAST_IF2), intf };
+                    Object[] args = new Object[]{ Integer.valueOf(java.net.SocketOptions.IP_MULTICAST_IF2), intf };
                     m.invoke(socketImpl, args);
                 }
 
@@ -511,7 +512,7 @@ final class UdpTransceiver implements Transceiver
                     Class<?>[] types = new Class<?>[]{ Integer.TYPE };
                     m = java.net.DatagramSocketImpl.class.getDeclaredMethod("setTimeToLive", types);
                     m.setAccessible(true);
-                    Object[] args = new Object[]{ new Integer(ttl) };
+                    Object[] args = new Object[]{ Integer.valueOf(ttl) };
                     m.invoke(socketImpl, args);
                 }
             }
diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index 8979f8e166f..a422f97a4df 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -38,7 +38,8 @@ final class AcceptorI implements IceInternal.Acceptor
 
         if(_instance.networkTraceLevel() >= 1)
         {
-            String s = "accepting ssl connections at " + toString();
+            StringBuffer s = new StringBuffer("accepting ssl connections at ");
+	    s.append(toString());
             if(_instance.networkTraceLevel() >= 3)
             {
                 java.util.List<String> interfaces = 
@@ -46,20 +47,20 @@ final class AcceptorI implements IceInternal.Acceptor
                                                                   _instance.protocolSupport(), true);
                 if(!interfaces.isEmpty())
                 {
-                    s += "\nlocal interfaces: ";
+                    s.append("\nlocal interfaces: ");
                     boolean first = true;
                     for(String iface : interfaces)
                     {
                         if(!first)
                         {
-                            s += ", ";
+                            s.append(", ");
                         }
-                        s += iface;
+                        s.append(iface);
                         first = false;
                     }
                 }
             }
-            _logger.trace(_instance.networkTraceCategory(), s);
+            _logger.trace(_instance.networkTraceCategory(), s.toString());
         }
     }
 
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index 5f58c8154b2..d91c25735e9 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -951,7 +951,7 @@ class Instance
                                 {
                                     sb.append(", ");
                                 }
-                                sb.append(dnsNames.get(j).toString());
+                                sb.append(dnsNames.get(j));
                             }
                         }
                         if(!ipAddresses.isEmpty())
@@ -963,7 +963,7 @@ class Instance
                                 {
                                     sb.append(", ");
                                 }
-                                sb.append(ipAddresses.get(j).toString());
+                                sb.append(ipAddresses.get(j));
                             }
                         }
                         if(_securityTraceLevel >= 1)
diff --git a/java/src/IceSSL/RFC2253.java b/java/src/IceSSL/RFC2253.java
index add105ca5e4..1272b15b6f2 100644
--- a/java/src/IceSSL/RFC2253.java
+++ b/java/src/IceSSL/RFC2253.java
@@ -162,7 +162,7 @@ class RFC2253
             throw new ParseException("invalid attribute type (expected end of state.data)");
         }
 
-        String result = new String();
+        StringBuffer result = new StringBuffer();
 
         //
         // RFC 1779.
@@ -188,7 +188,7 @@ class RFC2253
         {
             if(!Character.isDigit(state.data.charAt(state.pos)))
             {
-                result += state.data.substring(state.pos, state.pos + 4);
+                result.append(state.data.substring(state.pos, state.pos + 4));
                 state.pos += 4;
             }
 
@@ -197,13 +197,13 @@ class RFC2253
                 // 1*DIGIT
                 while(state.pos < state.data.length() && Character.isDigit(state.data.charAt(state.pos)))
                 {
-                    result += state.data.charAt(state.pos);
+                    result.append(state.data.charAt(state.pos));
                     ++state.pos;
                 }
                 // "." 1*DIGIT
                 if(state.pos < state.data.length() && state.data.charAt(state.pos) == '.')
                 {
-                    result += state.data.charAt(state.pos);
+                    result.append(state.data.charAt(state.pos));
                     ++state.pos;
                     // 1*DIGIT must follow "."
                     if(state.pos < state.data.length() && !Character.isDigit(state.data.charAt(state.pos)))
@@ -225,7 +225,7 @@ class RFC2253
             // KEYCHAR* otherwise it will not accept "O" as a valid
             // attribute type.
             //
-            result += state.data.charAt(state.pos);
+            result.append(state.data.charAt(state.pos));
             ++state.pos;
             // 1* KEYCHAR
             while(state.pos < state.data.length() &&
@@ -234,7 +234,7 @@ class RFC2253
                    Character.isLowerCase(state.data.charAt(state.pos)) ||
                    state.data.charAt(state.pos) == '-'))
             {
-                result += state.data.charAt(state.pos);
+                result.append(state.data.charAt(state.pos));
                 ++state.pos;
             }
         }
@@ -242,7 +242,7 @@ class RFC2253
         {
             throw new ParseException("invalid attribute type");
         }
-        return result;
+        return result.toString();
     }
 
     private static String
@@ -250,19 +250,19 @@ class RFC2253
         throws ParseException
     {
         eatWhite(state);
-        String result = new String();
         if(state.pos >= state.data.length())
         {
-            return result;
+            return "";
         }
 
         //
         // RFC 2253
         // # hexString
         //
+        StringBuffer result = new StringBuffer();
         if(state.data.charAt(state.pos) == '#')
         {
-            result += state.data.charAt(state.pos);
+            result.append(state.data.charAt(state.pos));
             ++state.pos;
             while(true)
             {
@@ -271,7 +271,7 @@ class RFC2253
                 {
                     break;
                 }
-                result += h;
+                result.append(h);
             }
         }
         //
@@ -281,7 +281,7 @@ class RFC2253
         //
         else if(state.data.charAt(state.pos) == '"')
         {
-            result += state.data.charAt(state.pos);
+            result.append(state.data.charAt(state.pos));
             ++state.pos;
             while(true)
             {
@@ -292,20 +292,20 @@ class RFC2253
                 // final terminating "
                 if(state.data.charAt(state.pos) == '"')
                 {
-                    result += state.data.charAt(state.pos);
+                    result.append(state.data.charAt(state.pos));
                     ++state.pos;
                     break;
                 }
                 // any character except '\'
                 else if(state.data.charAt(state.pos) != '\\')
                 {
-                    result += state.data.charAt(state.pos);
+                    result.append(state.data.charAt(state.pos));
                     ++state.pos;
                 }
                 // pair '\'
                 else
                 {
-                    result += parsePair(state);
+                    result.append(parsePair(state));
                 }
             }
         }
@@ -320,11 +320,11 @@ class RFC2253
             {
                 if(state.data.charAt(state.pos) == '\\')
                 {
-                    result += parsePair(state);
+                    result.append(parsePair(state));
                 }
                 else if(special.indexOf(state.data.charAt(state.pos)) == -1 && state.data.charAt(state.pos) != '"')
                 {
-                    result += state.data.charAt(state.pos);
+                    result.append(state.data.charAt(state.pos));
                     ++state.pos;
                 }
                 else
@@ -333,7 +333,7 @@ class RFC2253
                 }
             }
         }
-        return result;
+        return result.toString();
     }
 
     //
@@ -344,7 +344,7 @@ class RFC2253
     parsePair(ParseState state)
         throws ParseException
     {
-        String result = new String();
+        String result = "";
 
         assert(state.data.charAt(state.pos) == '\\');
         result += state.data.charAt(state.pos);
@@ -373,7 +373,7 @@ class RFC2253
     parseHexPair(ParseState state, boolean allowEmpty)
         throws ParseException
     {
-        String result = new String();
+        String result = "";
         if(state.pos < state.data.length() && hexvalid.indexOf(state.data.charAt(state.pos)) != -1)
         {
             result += state.data.charAt(state.pos);
diff --git a/java/src/IceSSL/TrustManager.java b/java/src/IceSSL/TrustManager.java
index fcf75a13c04..5dceca0a1e0 100644
--- a/java/src/IceSSL/TrustManager.java
+++ b/java/src/IceSSL/TrustManager.java
@@ -124,13 +124,13 @@ class TrustManager
                 {
                     if(_traceLevel > 1)
                     {
-                        String s = "trust manager matching PDNs:\n";
+                        StringBuffer s = new StringBuffer("trust manager matching PDNs:\n");
                         boolean addSemi = false;
                         for(java.util.List<RFC2253.RDNPair> rdnSet : matchSet)
                         {
                             if(addSemi)
                             {
-                                s += ';';
+                                s.append(';');
                             }
                             addSemi = true;
                             boolean addComma = false;
@@ -138,15 +138,15 @@ class TrustManager
                             {
                                 if(addComma)
                                 {
-                                    s += ',';
+                                    s.append(',');
                                 }
                                 addComma = true;
-                                s += rdn.key;
-                                s += '=';
-                                s += rdn.value;
+                                s.append(rdn.key);
+                                s.append('=');
+                                s.append(rdn.value);
                             }
                         }
-                        _communicator.getLogger().trace("Security", s);
+                        _communicator.getLogger().trace("Security", s.toString());
                     }
                     if(match(matchSet, dn))
                     {
@@ -250,20 +250,20 @@ class TrustManager
             new java.util.LinkedList<java.util.List<RFC2253.RDNPair> >();
         for(java.util.List<RFC2253.RDNPair> dn : l)
         {
-            String v = new String();
+            StringBuffer v = new StringBuffer();
             boolean first = true;
             for(RFC2253.RDNPair pair : dn)
             {
                 if(!first)
                 {
-                    v += ",";
+                    v.append(",");
                 }
                 first = false;
-                v += pair.key;
-                v += "=";
-                v += pair.value;
+                v.append(pair.key);
+                v.append("=");
+                v.append(pair.value);
             }
-            javax.security.auth.x500.X500Principal princ = new javax.security.auth.x500.X500Principal(v);
+            javax.security.auth.x500.X500Principal princ = new javax.security.auth.x500.X500Principal(v.toString());
             String subjectName = princ.getName(javax.security.auth.x500.X500Principal.RFC2253);
             result.add(RFC2253.parseStrict(subjectName));
         }