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, 119 insertions, 1 deletions

diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 6176c13723d..b277d8f0b52 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -62,6 +62,21 @@ private:
 };
 typedef IceUtil::Handle<GetAdapterNameCB> GetAdapterNameCBPtr;
 
+class NoOpGetAdapterNameCB : public AMI_TestIntf_getAdapterName
+{
+public:
+
+    virtual void
+    ice_response(const string&)
+    {
+    }
+
+    virtual void
+    ice_exception(const Ice::Exception&)
+    {
+    }
+};
+
 string
 getAdapterNameWithAMI(const TestIntfPrx& test)
 {
@@ -220,6 +235,95 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     cout << "ok" << endl;
 
+    cout << "testing binding with multiple random endpoints... " << flush;
+    {
+        vector<RemoteObjectAdapterPrx> adapters;
+        adapters.push_back(com->createObjectAdapter("AdapterRandom11", "default"));
+        adapters.push_back(com->createObjectAdapter("AdapterRandom12", "default"));
+        adapters.push_back(com->createObjectAdapter("AdapterRandom13", "default"));
+        adapters.push_back(com->createObjectAdapter("AdapterRandom14", "default"));
+        adapters.push_back(com->createObjectAdapter("AdapterRandom15", "default"));
+
+#ifdef _WIN32
+        int count = 60;
+#else
+        int count = 20;
+#endif
+        int adapterCount = static_cast<int>(adapters.size());
+        while(--count > 0)
+        {
+#ifdef _WIN32
+            if(count == 10)
+            {
+                com->deactivateObjectAdapter(adapters[4]);
+                --adapterCount;
+            }
+            vector<TestIntfPrx> proxies;
+            proxies.resize(10);
+#else
+            if(count < 60 && count % 10 == 0)
+            {
+                com->deactivateObjectAdapter(adapters[count / 10 - 1]);
+                --adapterCount;
+            }
+            vector<TestIntfPrx> proxies;
+            proxies.resize(40);
+#endif
+            unsigned int i;
+            for(i = 0; i < proxies.size(); ++i)
+            {
+                vector<RemoteObjectAdapterPrx> adpts;
+                adpts.resize(IceUtilInternal::random(static_cast<int>(adapters.size())));
+                if(adpts.empty())
+                {
+                    adpts.resize(1);
+                }
+                for(vector<RemoteObjectAdapterPrx>::iterator p = adpts.begin(); p != adpts.end(); ++p)
+                {
+                    *p = adapters[IceUtilInternal::random(static_cast<int>(adapters.size()))];
+                }
+                proxies[i] = createTestIntfPrx(adpts);
+            }
+            
+            for(i = 0; i < proxies.size(); i++)
+            {
+                proxies[i]->getAdapterName_async(new NoOpGetAdapterNameCB());
+            }
+            for(i = 0; i < proxies.size(); i++)
+            {
+                try
+                {
+                    proxies[i]->ice_ping();
+                }
+                catch(const Ice::LocalException&)
+                {
+                }
+            }
+            set<Ice::ConnectionPtr> connections;
+            for(i = 0; i < proxies.size(); i++)
+            {
+                if(proxies[i]->ice_getCachedConnection())
+                {
+                    connections.insert(proxies[i]->ice_getCachedConnection());
+                }
+            }
+            test(static_cast<int>(connections.size()) <= adapterCount);
+
+            for(vector<RemoteObjectAdapterPrx>::const_iterator q = adapters.begin(); q != adapters.end(); ++q)
+            {
+                try
+                {
+                    (*q)->getTestIntf()->ice_getConnection()->close(false);
+                }
+                catch(const Ice::LocalException&)
+                {
+                    // Expected if adapter is down.
+                }
+            }
+        }
+    }
+    cout << "ok" << endl;
+
     cout << "testing binding with multiple endpoints and AMI... " << flush;
     {
         vector<RemoteObjectAdapterPrx> adapters;
@@ -376,6 +480,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             test->getAdapterName();
         }
         catch(const Ice::ConnectionRefusedException&)
@@ -423,6 +530,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             test(test3->ice_getConnection() == test1->ice_getConnection());
             test(false);
         }
@@ -462,7 +572,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         com->deactivateObjectAdapter(adapters[2]);
 
-
         test(test->getAdapterName() == "Adapter52");
         
         deactivate(com, adapters);
@@ -536,6 +645,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             test->getAdapterName();
         }
         catch(const Ice::ConnectionRefusedException&)
@@ -595,6 +707,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             test->getAdapterName();
         }
         catch(const Ice::ConnectionRefusedException&)
@@ -636,6 +751,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(test->ice_getConnection() != testUDP->ice_getConnection());
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             testUDP->getAdapterName();
         }
         catch(const Ice::TwowayOnlyException&)