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, 118 insertions, 0 deletions

diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java
index 753837e762a..2c9db86d7c8 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/Ice/binding/AllTests.java
@@ -20,6 +20,24 @@ public class AllTests
         }
     }
 
+    static class NoOpGetAdapterNameCB extends AMI_TestIntf_getAdapterName
+    {
+        public
+        void ice_response(String name)
+        {
+        }
+        
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+        }
+
+        public void
+        ice_exception(Ice.UserException ex)
+        {
+        }
+    };
+
     static class GetAdapterNameCB extends AMI_TestIntf_getAdapterName
     {
         synchronized public void
@@ -229,6 +247,106 @@ public class AllTests
         }
         System.out.println("ok");
 
+        System.out.print("testing binding with multiple random endpoints... ");
+        System.out.flush();
+        {
+            java.util.Random rand = new java.util.Random();
+
+            RemoteObjectAdapterPrx[] adapters = new RemoteObjectAdapterPrx[5];
+            adapters[0] = com.createObjectAdapter("AdapterRandom11", "default");
+            adapters[1] = com.createObjectAdapter("AdapterRandom12", "default");
+            adapters[2] = com.createObjectAdapter("AdapterRandom13", "default");
+            adapters[3] = com.createObjectAdapter("AdapterRandom14", "default");
+            adapters[4] = com.createObjectAdapter("AdapterRandom15", "default");
+
+            int count;
+            if(System.getProperty("os.name").startsWith("Windows"))
+            {
+                count = 20;
+            }
+            else
+            {
+                count = 60;
+            }
+            
+            int adapterCount = adapters.length;
+            while(--count > 0)
+            {
+                TestIntfPrx[] proxies;
+                if(System.getProperty("os.name").startsWith("Windows"))
+                {
+                    if(count == 10)
+                    {
+                        com.deactivateObjectAdapter(adapters[4]);
+                        --adapterCount;
+                    }
+                    proxies = new TestIntfPrx[10];
+                }
+                else
+                {
+                    if(count < 60 && count % 10 == 0)
+                    {
+                        com.deactivateObjectAdapter(adapters[count / 10 - 1]);
+                        --adapterCount;
+                    }
+                    proxies = new TestIntfPrx[40];
+                }
+
+                int i;
+                for(i = 0; i < proxies.length; ++i)
+                {
+                    RemoteObjectAdapterPrx[] adpts = new RemoteObjectAdapterPrx[rand.nextInt(adapters.length)];
+                    if(adpts.length == 0)
+                    {
+                        adpts = new RemoteObjectAdapterPrx[1];
+                    }
+                    for(int j = 0; j < adpts.length; ++j)
+                    {
+                        adpts[j] = adapters[rand.nextInt(adapters.length)];
+                    }
+                    proxies[i] = createTestIntfPrx(java.util.Arrays.asList((adpts)));
+                }
+            
+                for(i = 0; i < proxies.length; i++)
+                {
+                    proxies[i].getAdapterName_async(new NoOpGetAdapterNameCB());
+                }
+                for(i = 0; i < proxies.length; i++)
+                {
+                    try
+                    {
+                        proxies[i].ice_ping();
+                    }
+                    catch(Ice.LocalException ex)
+                    {
+                    }
+                }
+
+                java.util.Set<Ice.Connection> connections = new java.util.HashSet<Ice.Connection>();
+                for(i = 0; i < proxies.length; i++)
+                {
+                    if(proxies[i].ice_getCachedConnection() != null)
+                    {
+                        connections.add(proxies[i].ice_getCachedConnection());
+                    }
+                }
+                test(connections.size() <= adapterCount);
+
+                for(RemoteObjectAdapterPrx a : adapters)
+                {
+                    try
+                    {
+                        a.getTestIntf().ice_getConnection().close(false);
+                    }
+                    catch(Ice.LocalException ex)
+                    {
+                        // Expected if adapter is down.
+                    }
+                }
+            }
+        }
+        System.out.println("ok");
+
         System.out.print("testing binding with multiple endpoints and AMI... ");
         System.out.flush();
         {