Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 19 insertions, 8 deletions

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
                 {