Updated fault tolerance tests to correctly destroy the communicator created

    by the client. This has exposed a bug in the Ice run time. With the way
    the test now works, the client receives a ConnectionRefusedException
    whereas, previously, the adapter was deactivated on the server side.
    Depending on how endpoints are shuffled in Reference.cpp, this
    occasionally causes a test failure. It appears that we need to change
    the run time to
- recognize when an endpoint has gone dead and react correctly
- avoid re-trying endpoints that have previously failed
As is, the test gets slower and slower towards the end because it keeps
    trying endpoints of servers that were killed in previous iterations.

1 files changed, 18 insertions, 2 deletions

diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 1f439c7ed7e..60c6e2dc250 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -10,8 +10,9 @@
 #include <Ice/Ice.h>
 #include <TestI.h>
 
-TestI::TestI(const Ice::ObjectAdapterPtr& adapter) :
-    _adapter(adapter)
+TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const CleanerPtr& cleaner) :
+    _adapter(adapter),
+    _cleaner(cleaner)
 {
 }
 
@@ -48,3 +49,18 @@ TestI::pid(const Ice::Current&)
     return getpid();
 #endif
 }
+
+CleanerI::CleanerI(const Ice::CommunicatorPtr& communicator)
+{
+    _communicator = communicator;
+}
+
+void
+CleanerI::cleanup(const Ice::Current&)
+{
+    if(_communicator)
+    {
+        _communicator->destroy();
+	_communicator = 0;
+    }
+}