1 files changed, 7 insertions, 40 deletions

diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index 2155406fb84..14533937a2a 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -20,8 +20,8 @@ using namespace Test;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& communicator2)
 {
-    RetryPrx allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
-    RetryPrx retry = allTests(communicator, communicator2, "retry:default -p 12010");
+    RetryPrxPtr allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
+    RetryPrxPtr retry = allTests(communicator, communicator2, "retry:" + getTestEndpoint(communicator, 0));
     retry->shutdown();
     return EXIT_SUCCESS;
 }
@@ -32,17 +32,11 @@ main(int argc, char* argv[])
 #ifdef ICE_STATIC_LIBS
     Ice::registerIceSSL();
 #endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-    Ice::CommunicatorPtr communicator2;
-
     try
     {
         initCounts();
 
-        Ice::InitializationData initData;
-        initData.properties = Ice::createProperties(argc, argv);
+        Ice::InitializationData initData = getTestInitData(argc, argv);
         initData.observer = getObserver();
         //
         // This test kills connections, so we don't want warnings.
@@ -53,7 +47,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.PrintStackTraces", "0");
 
         initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
 
         //
         // Configure a second communicator for the invocation timeout
@@ -64,39 +58,12 @@ main(int argc, char* argv[])
         initData2.properties = initData.properties->clone();
         initData2.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
         initData2.observer = getObserver();
-        communicator2 = Ice::initialize(initData2);
-        status = run(argc, argv, communicator, communicator2);
+        Ice::CommunicatorHolder ich2 = Ice::initialize(initData2);
+        return run(argc, argv, ich.communicator(), ich2.communicator());
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        try
-        {
-            communicator->destroy();
-        }
-        catch(const Ice::Exception& ex)
-        {
-            cerr << ex << endl;
-            status = EXIT_FAILURE;
-        }
-    }
-    if(communicator2)
-    {
-        try
-        {
-            communicator2->destroy();
-        }
-        catch(const Ice::Exception& ex)
-        {
-            cerr << ex << endl;
-            status = EXIT_FAILURE;
-        }
+        return EXIT_FAILURE;
     }
-
-    return status;
 }