6 files changed, 15 insertions, 53 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
diff --git a/cs/test/Ice/retry/RetryI.cs b/cs/test/Ice/retry/RetryI.cs
index 024b4890b6b..9a58b9c660e 100644
--- a/cs/test/Ice/retry/RetryI.cs
+++ b/cs/test/Ice/retry/RetryI.cs
@@ -35,15 +35,7 @@ public sealed class RetryI : Test.RetryDisp_
         if(nRetry > _counter)
         {
             ++_counter;
-            if(current.con != null)
-            {
-                current.con.close(true);
-            }
-            else
-            {
-                throw new Ice.ConnectionLostException();
-            }
-            return 0;
+            throw new Ice.ConnectionLostException();
         }
         int counter = _counter;
         _counter = 0;
@@ -52,14 +44,7 @@ public sealed class RetryI : Test.RetryDisp_
     
     public override void opNotIdempotent(Ice.Current current)
     {
-        if(current.con != null)
-        {
-            current.con.close(true);
-        }
-        else
-        {
-            throw new Ice.ConnectionLostException();
-        }
+        throw new Ice.ConnectionLostException();
     }
     
     public override void opSystemException(Ice.Current c)
diff --git a/cs/test/Ice/retry/Server.cs b/cs/test/Ice/retry/Server.cs
index 1ed0e76fd8c..0eb3175a772 100644
--- a/cs/test/Ice/retry/Server.cs
+++ b/cs/test/Ice/retry/Server.cs
@@ -37,7 +37,10 @@ public class Server
 
         try
         {
-            communicator = Ice.Util.initialize(ref args);
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = Ice.Util.createProperties(ref args);
+            initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+            communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
         catch(System.Exception ex)
diff --git a/java/test/src/main/java/test/Ice/retry/RetryI.java b/java/test/src/main/java/test/Ice/retry/RetryI.java
index f2afcc881dd..9005b471769 100644
--- a/java/test/src/main/java/test/Ice/retry/RetryI.java
+++ b/java/test/src/main/java/test/Ice/retry/RetryI.java
@@ -47,15 +47,7 @@ public final class RetryI extends _RetryDisp
         if(nRetry > _counter)
         {
             ++_counter;
-            if(current.con != null)
-            {
-                current.con.close(true);
-            }
-            else
-            {
-                throw new Ice.ConnectionLostException();
-            }
-            return 0;
+            throw new Ice.ConnectionLostException();
         }
 
         int counter = _counter;
@@ -67,14 +59,7 @@ public final class RetryI extends _RetryDisp
     public void
     opNotIdempotent(Ice.Current current)
     {
-        if(current.con != null)
-        {
-            current.con.close(true);
-        }
-        else
-        {
-            throw new Ice.ConnectionLostException();
-        }
+        throw new Ice.ConnectionLostException();
     }
     
     @Override
diff --git a/java/test/src/main/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java
index a744748958b..fcf71969b47 100644
--- a/java/test/src/main/java/test/Ice/retry/Server.java
+++ b/java/test/src/main/java/test/Ice/retry/Server.java
@@ -28,6 +28,7 @@ public class Server extends test.Util.Application
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
+        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         return initData;
     }