Fixed ICE-5751 - don't close the connections for retries

2 files changed, 6 insertions, 18 deletions

diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index efb074c3d3e..34946a5d1c4 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -36,7 +36,10 @@ main(int argc, char* argv[])
 
     try
     {
-        communicator = Ice::initialize(argc, argv);
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+        communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator);
     }
     catch(const Ice::Exception& ex)
diff --git a/cpp/test/Ice/retry/TestI.cpp b/cpp/test/Ice/retry/TestI.cpp
index 9a0ed3fc81d..b2cbc9900c0 100644
--- a/cpp/test/Ice/retry/TestI.cpp
+++ b/cpp/test/Ice/retry/TestI.cpp
@@ -43,15 +43,7 @@ RetryI::opIdempotent(int nRetry, const Ice::Current& current)
     if(nRetry > _counter)
     {
         ++_counter;
-        if(current.con)
-        {
-            current.con->close(true);
-        }
-        else
-        {
-            throw Ice::ConnectionLostException(__FILE__, __LINE__);
-        }
-        return 0;
+        throw Ice::ConnectionLostException(__FILE__, __LINE__);
     }
     int counter = _counter;
     _counter = 0;
@@ -61,14 +53,7 @@ RetryI::opIdempotent(int nRetry, const Ice::Current& current)
 void
 RetryI::opNotIdempotent(const Ice::Current& current)
 {
-    if(current.con)
-    {
-        current.con->close(true);
-    }
-    else
-    {
-        throw Ice::ConnectionLostException(__FILE__, __LINE__);
-    }
+    throw Ice::ConnectionLostException(__FILE__, __LINE__);
 }
 
 void