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, 32 insertions, 19 deletions

diff --git a/java/src/ant/Slice2FreezeJTask.java b/java/src/ant/Slice2FreezeJTask.java
index 139230ff3ae..49f2f0f97d3 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
@@ -308,17 +317,17 @@ public class Slice2FreezeJTask extends SliceTask
         //
         // Add the --dict options.
         //
-        cmd.append(dictString);
+        cmd.append(dictString.toString());
 
         //
         // Add the --dict-index options.
         //
-        cmd.append(dictIndexString);
+        cmd.append(dictIndexString.toString());
 
         //
         // Add the --index options.
         //
-        cmd.append(indexString);
+        cmd.append(indexString.toString());
 
         //
         // Add the --meta options.
@@ -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
                     {
@@ -404,17 +416,17 @@ public class Slice2FreezeJTask extends SliceTask
             //
             // Add the --dict options.
             //
-            cmd.append(dictString);
+            cmd.append(dictString.toString());
 
             //
             // Add the --dict-index options.
             //
-            cmd.append(dictIndexString);
+            cmd.append(dictIndexString.toString());
 
              //
             // Add the --index options.
             //
-            cmd.append(indexString);
+            cmd.append(indexString.toString());
 
             //
             // Add the slice files.
@@ -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
                 {
@@ -435,7 +449,6 @@ public class Slice2FreezeJTask extends SliceTask
                 }
             }
  
-
             //
             // It's not possible anymore to re-use the same output property since Ant 1.5.x. so we use a 
             // unique property name here. Perhaps we should output the dependencies to a file instead.