ICE-7560 - more AMI test fixes, renaming ConnectionClose enumerators

21 files changed, 152 insertions, 124 deletions

diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
index 0130c676dd5..80f63e8865d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
@@ -162,17 +162,17 @@ public final class ConnectionI extends IceInternal.EventHandler
             throw new Ice.OperationInterruptedException();
         }
 
-        if(mode == ConnectionClose.CloseForcefully)
+        if(mode == ConnectionClose.Forcefully)
         {
             setState(StateClosed, new ConnectionManuallyClosedException(false));
         }
-        else if(mode == ConnectionClose.CloseGracefully)
+        else if(mode == ConnectionClose.Gracefully)
         {
             setState(StateClosing, new ConnectionManuallyClosedException(true));
         }
         else
         {
-            assert(mode == ConnectionClose.CloseGracefullyAndWait);
+            assert(mode == ConnectionClose.GracefullyWithWait);
 
             //
             // Wait until all outstanding requests have been completed.
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
index 60514dfd230..ce8e69a940f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
@@ -141,7 +141,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice
                     //
                     for(Ice.ConnectionI c : connections)
                     {
-                        c.close(Ice.ConnectionClose.CloseForcefully);
+                        c.close(Ice.ConnectionClose.Forcefully);
                     }
                     throw e;
                 }
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
index 3102f3a500f..63792c49368 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
@@ -133,7 +133,7 @@ public final class OutgoingConnectionFactory
                     {
                         for(Ice.ConnectionI c : l)
                         {
-                            c.close(Ice.ConnectionClose.CloseForcefully);
+                            c.close(Ice.ConnectionClose.Forcefully);
                         }
                     }
                     throw new Ice.OperationInterruptedException();
diff --git a/java-compat/test/src/main/java/test/Ice/ami/AMI.java b/java-compat/test/src/main/java/test/Ice/ami/AMI.java
index e3d3b792338..51ce40bc06f 100644
--- a/java-compat/test/src/main/java/test/Ice/ami/AMI.java
+++ b/java-compat/test/src/main/java/test/Ice/ami/AMI.java
@@ -629,7 +629,6 @@ public class AMI
     run(Application app, Ice.Communicator communicator, boolean collocated, TestIntfPrx p,
         TestIntfControllerPrx testController)
     {
-
         PrintWriter out = app.getWriter();
 
         out.print("testing begin/end invocation... ");
@@ -1830,7 +1829,7 @@ public class AMI
                 test(p.opBatchCount() == 0);
                 TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
                 b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 final FlushCallback cb = new FlushCallback();
                 Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
                     new Ice.Callback()
@@ -1892,7 +1891,7 @@ public class AMI
                 TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
                 b1.ice_getConnection();
                 b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 final FlushCallback cb = new FlushCallback();
                 Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
                     new Ice.Callback_Object_ice_flushBatchRequests()
@@ -1962,7 +1961,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
                                                                          p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushExCallback cb = new FlushExCallback();
                     Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2026,7 +2025,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
                                                                          p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushExCallback cb = new FlushExCallback();
                     Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2095,7 +2094,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
                                                                          p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2171,7 +2170,7 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2209,8 +2208,8 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2274,7 +2273,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(
                         p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2350,7 +2349,7 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2388,8 +2387,8 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -2613,33 +2612,30 @@ public class AMI
         }
         out.println("ok");
 
-        if(p.ice_getConnection() != null)
+        if(p.ice_getConnection() != null && p.supportsAMD())
         {
             out.print("testing graceful close connection with wait... ");
             out.flush();
             {
                 //
-                // Local case: begin several requests, close the connection gracefully, and make sure it waits
-                // for the requests to complete.
+                // Local case: begin a request, close the connection gracefully, and make sure it waits
+                // for the request to complete.
                 //
-                java.util.List<Ice.AsyncResult> results = new java.util.ArrayList<>();
-                for(int i = 0; i < 3; ++i)
+                CloseCallback cb = new CloseCallback();
+                Ice.Connection con = p.ice_getConnection();
+                con.setCloseCallback(cb);
+                Ice.AsyncResult r = p.begin_sleep(100);
+                con.close(Ice.ConnectionClose.GracefullyWithWait); // Blocks until the request completes.
+                r.waitForCompleted(); // Should complete successfully.
+                try
                 {
-                    results.add(p.begin_sleep(50));
+                    r.throwLocalException();
                 }
-                p.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
-                for(Ice.AsyncResult r : results)
+                catch(Throwable ex)
                 {
-                    r.waitForCompleted();
-                    try
-                    {
-                        r.throwLocalException();
-                    }
-                    catch(Throwable ex)
-                    {
-                        test(false);
-                    }
+                    test(false);
                 }
+                cb.check();
             }
             {
                 //
@@ -2663,7 +2659,7 @@ public class AMI
                     {
                         results.add(p.begin_opWithPayload(seq));
                     }
-                    if(!p.begin_close(CloseMode.CloseGracefullyAndWait).isSent())
+                    if(!p.begin_close(CloseMode.GracefullyWithWait).isSent())
                     {
                         for(int i = 0; i < maxQueue; i++)
                         {
@@ -2702,17 +2698,15 @@ public class AMI
             out.flush();
             {
                 //
-                // Local case: start a lengthy operation and then close the connection gracefully on the client side
+                // Local case: start an operation and then close the connection gracefully on the client side
                 // without waiting for the pending invocation to complete. There will be no retry and we expect the
                 // invocation to fail with ConnectionManuallyClosedException.
                 //
-                // This test requires two threads in the server's thread pool: one will block in sleep() and the other
-                // will process the CloseConnection message.
-                //
-                p.ice_ping();
+                p = (TestIntfPrx)p.ice_connectionId("CloseGracefully"); // Start with a new connection.
                 Ice.Connection con = p.ice_getConnection();
-                Ice.AsyncResult r = p.begin_sleep(100);
-                con.close(Ice.ConnectionClose.CloseGracefully);
+                Ice.AsyncResult r = p.begin_startDispatch();
+                r.waitForSent(); // Ensure the request was sent before we close the connection.
+                con.close(Ice.ConnectionClose.Gracefully);
                 r.waitForCompleted();
                 try
                 {
@@ -2723,20 +2717,18 @@ public class AMI
                 {
                     test(ex.graceful);
                 }
+                p.finishDispatch();
 
                 //
-                // Remote case: the server closes the connection gracefully. Our call to TestIntf::close()
-                // completes successfully and then the connection should be closed immediately afterward,
-                // despite the fact that there's a pending call to sleep(). The call to sleep() should be
-                // automatically retried and complete successfully.
+                // Remote case: the server closes the connection gracefully, which means the connection
+                // will not be closed until all pending dispatched requests have completed.
                 //
-                p.ice_ping();
                 con = p.ice_getConnection();
                 CloseCallback cb = new CloseCallback();
                 con.setCloseCallback(cb);
                 r = p.begin_sleep(100);
-                p.close(CloseMode.CloseGracefully);
-                cb.check();
+                p.close(CloseMode.Gracefully); // Close is delayed until sleep completes.
+                cb.check(); // Ensure connection was closed.
                 r.waitForCompleted();
                 try
                 {
@@ -2746,8 +2738,6 @@ public class AMI
                 {
                     test(false);
                 }
-                p.ice_ping();
-                test(p.ice_getConnection() != con);
             }
             out.println("ok");
 
@@ -2755,13 +2745,14 @@ public class AMI
             out.flush();
             {
                 //
-                // Local case: start a lengthy operation and then close the connection forcefully on the client side.
+                // Local case: start an operation and then close the connection forcefully on the client side.
                 // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException.
                 //
                 p.ice_ping();
                 Ice.Connection con = p.ice_getConnection();
-                Ice.AsyncResult r = p.begin_sleep(100);
-                con.close(Ice.ConnectionClose.CloseForcefully);
+                Ice.AsyncResult r = p.begin_startDispatch();
+                r.waitForSent(); // Ensure the request was sent before we close the connection.
+                con.close(Ice.ConnectionClose.Forcefully);
                 r.waitForCompleted();
                 try
                 {
@@ -2772,6 +2763,7 @@ public class AMI
                 {
                     test(!ex.graceful);
                 }
+                p.finishDispatch();
 
                 //
                 // Remote case: the server closes the connection forcefully. This causes the request to fail
@@ -2780,7 +2772,7 @@ public class AMI
                 //
                 try
                 {
-                    p.close(CloseMode.CloseForcefully);
+                    p.close(CloseMode.Forcefully);
                     test(false);
                 }
                 catch(Ice.ConnectionLostException ex)
diff --git a/java-compat/test/src/main/java/test/Ice/ami/Test.ice b/java-compat/test/src/main/java/test/Ice/ami/Test.ice
index c6a72decd11..f0e50bd642f 100644
--- a/java-compat/test/src/main/java/test/Ice/ami/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/ami/Test.ice
@@ -21,9 +21,9 @@ exception TestIntfException
 
 enum CloseMode
 {
-    CloseForcefully,
-    CloseGracefully,
-    CloseGracefullyAndWait
+    Forcefully,
+    Gracefully,
+    GracefullyWithWait
 };
 
 interface TestIntf
@@ -38,8 +38,11 @@ interface TestIntf
     bool waitForBatch(int count);
     void close(CloseMode mode);
     void sleep(int ms);
+    ["amd"] void startDispatch();
+    void finishDispatch();
     void shutdown();
 
+    bool supportsAMD();
     bool supportsFunctionalTests();
     bool opBool(bool b);
     byte opByte(byte b);
diff --git a/java-compat/test/src/main/java/test/Ice/ami/TestI.java b/java-compat/test/src/main/java/test/Ice/ami/TestI.java
index af4c50e5d33..aa6c1ce0a41 100644
--- a/java-compat/test/src/main/java/test/Ice/ami/TestI.java
+++ b/java-compat/test/src/main/java/test/Ice/ami/TestI.java
@@ -10,6 +10,7 @@
 package test.Ice.ami;
 
 import test.Ice.ami.Test._TestIntfDisp;
+import test.Ice.ami.Test.AMD_TestIntf_startDispatch;
 import test.Ice.ami.Test.CloseMode;
 import test.Ice.ami.Test.TestIntfException;
 
@@ -62,6 +63,12 @@ public class TestI extends _TestIntfDisp
     }
 
     @Override
+    public boolean supportsAMD(Ice.Current current)
+    {
+        return true;
+    }
+
+    @Override
     public boolean supportsFunctionalTests(Ice.Current current)
     {
         return true;
@@ -149,11 +156,37 @@ public class TestI extends _TestIntfDisp
     }
 
     @Override
-    public void
+    public synchronized void
+    startDispatch_async(AMD_TestIntf_startDispatch cb, Ice.Current current)
+    {
+        _pending.add(cb);
+    }
+
+    @Override
+    public synchronized void
+    finishDispatch(Ice.Current current)
+    {
+        for(AMD_TestIntf_startDispatch cb : _pending)
+        {
+            cb.ice_response();
+        }
+        _pending.clear();
+    }
+
+    @Override
+    public synchronized void
     shutdown(Ice.Current current)
     {
+        //
+        // Just in case a request arrived late.
+        //
+        for(AMD_TestIntf_startDispatch cb : _pending)
+        {
+            cb.ice_response();
+        }
         current.adapter.getCommunicator().shutdown();
     }
 
     private int _batchCount;
+    private java.util.List<AMD_TestIntf_startDispatch> _pending = new java.util.LinkedList<>();
 }
diff --git a/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java b/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java
index f64ea6dda04..ed3eba066eb 100644
--- a/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java
+++ b/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java
@@ -845,7 +845,7 @@ public class AMI
                 test(p.opBatchCount() == 0);
                 TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
                 b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 final FlushCallback cb = new FlushCallback();
                 Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
                     null,
@@ -903,7 +903,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
                                                                          p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushExCallback cb = new FlushExCallback();
                     Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -950,7 +950,7 @@ public class AMI
                     TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
                                                                          p.ice_getIdentity()).ice_batchOneway());
                     b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -1004,7 +1004,7 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
@@ -1031,8 +1031,8 @@ public class AMI
                     b2.ice_getConnection(); // Ensure connection is established.
                     b1.opBatch();
                     b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     final FlushCallback cb = new FlushCallback();
                     Ice.AsyncResult r = communicator.begin_flushBatchRequests(
                         Ice.CompressBatch.BasedOnProxy,
diff --git a/java-compat/test/src/main/java/test/Ice/background/AllTests.java b/java-compat/test/src/main/java/test/Ice/background/AllTests.java
index e3f92a9f4d9..735c10f5e32 100644
--- a/java-compat/test/src/main/java/test/Ice/background/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/background/AllTests.java
@@ -398,7 +398,7 @@ public class AllTests
             configuration.buffered(true);
             backgroundController.buffered(true);
             background.begin_op();
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
             background.begin_op();
 
             OpAMICallbackNoOp cb = new OpAMICallbackNoOp();
@@ -439,7 +439,7 @@ public class AllTests
         {
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         for(int i = 0; i < 4; ++i)
         {
@@ -505,7 +505,7 @@ public class AllTests
             }
 
             configuration.connectException(new Ice.SocketException());
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
             try
             {
                 Thread.sleep(10);
@@ -548,7 +548,7 @@ public class AllTests
             ex.printStackTrace();
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         for(int i = 0; i < 4; i++)
         {
@@ -611,7 +611,7 @@ public class AllTests
         {
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         try
         {
@@ -623,7 +623,7 @@ public class AllTests
         {
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         try
         {
@@ -667,7 +667,7 @@ public class AllTests
         {
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         try
         {
@@ -702,7 +702,7 @@ public class AllTests
             }
 
             configuration.initializeException(new Ice.SocketException());
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
             try
             {
                 Thread.sleep(10);
@@ -728,7 +728,7 @@ public class AllTests
             }
 
             configuration.initializeSocketStatus(IceInternal.SocketOperation.Write);
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
 
             try
             {
@@ -743,7 +743,7 @@ public class AllTests
             configuration.initializeSocketStatus(IceInternal.SocketOperation.None);
 
             ctl.initializeException(true);
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
             try
             {
                 Thread.sleep(10);
@@ -771,7 +771,7 @@ public class AllTests
             try
             {
                 ctl.initializeSocketStatus(IceInternal.SocketOperation.Write);
-                background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+                background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
                 background.op();
                 ctl.initializeSocketStatus(IceInternal.SocketOperation.None);
             }
@@ -806,7 +806,7 @@ public class AllTests
         {
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         try
         {
@@ -852,7 +852,7 @@ public class AllTests
                 ex.printStackTrace();
                 test(false);
             }
-            background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             try
             {
@@ -922,7 +922,7 @@ public class AllTests
             ex.printStackTrace();
             test(false);
         }
-        background.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        background.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         try
         {
@@ -952,7 +952,7 @@ public class AllTests
         backgroundBatchOneway.op();
         ctl.resumeAdapter();
         backgroundBatchOneway.ice_flushBatchRequests();
-        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         //
         // Send bigger requests to test with auto-flushing.
@@ -964,7 +964,7 @@ public class AllTests
         backgroundBatchOneway.opWithPayload(seq);
         ctl.resumeAdapter();
         backgroundBatchOneway.ice_flushBatchRequests();
-        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         //
         // Then try the same thing with async flush.
@@ -976,7 +976,7 @@ public class AllTests
         backgroundBatchOneway.op();
         ctl.resumeAdapter();
         backgroundBatchOneway.begin_ice_flushBatchRequests();
-        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
         ctl.holdAdapter();
         backgroundBatchOneway.opWithPayload(seq);
@@ -986,7 +986,7 @@ public class AllTests
         ctl.resumeAdapter();
         r = backgroundBatchOneway.begin_ice_flushBatchRequests();
         backgroundBatchOneway.end_ice_flushBatchRequests(r);
-        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        backgroundBatchOneway.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
     }
 
     private static void
@@ -1328,7 +1328,7 @@ public class AllTests
             }
 
             background.ice_ping();
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
             try
             {
                 Thread.sleep(10);
@@ -1337,7 +1337,7 @@ public class AllTests
             {
             }
 
-            background.ice_getCachedConnection().close(Ice.ConnectionClose.CloseForcefully);
+            background.ice_getCachedConnection().close(Ice.ConnectionClose.Forcefully);
         }
 
         thread1._destroy();
diff --git a/java-compat/test/src/main/java/test/Ice/binding/AllTests.java b/java-compat/test/src/main/java/test/Ice/binding/AllTests.java
index 062a5c87393..cc7541f9e68 100644
--- a/java-compat/test/src/main/java/test/Ice/binding/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/binding/AllTests.java
@@ -176,7 +176,7 @@ public class AllTests
                 test(test2.ice_getConnection() == test3.ice_getConnection());
 
                 names.remove(test1.getAdapterName());
-                test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             //
@@ -198,7 +198,7 @@ public class AllTests
 
                 for(RemoteObjectAdapterPrx p : adapters)
                 {
-                    p.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    p.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
             }
 
@@ -224,7 +224,7 @@ public class AllTests
                 test(test2.ice_getConnection() == test3.ice_getConnection());
 
                 names.remove(test1.getAdapterName());
-                test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             //
@@ -332,7 +332,7 @@ public class AllTests
                 {
                     try
                     {
-                        a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                        a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     }
                     catch(Ice.LocalException ex)
                     {
@@ -374,7 +374,7 @@ public class AllTests
                 test(test2.ice_getConnection() == test3.ice_getConnection());
 
                 names.remove(getAdapterNameWithAMI(test1));
-                test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             //
@@ -396,7 +396,7 @@ public class AllTests
 
                 for(RemoteObjectAdapterPrx p : adapters)
                 {
-                    p.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    p.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
             }
 
@@ -422,7 +422,7 @@ public class AllTests
                 test(test2.ice_getConnection() == test3.ice_getConnection());
 
                 names.remove(getAdapterNameWithAMI(test1));
-                test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             //
@@ -455,7 +455,7 @@ public class AllTests
             while(!names.isEmpty())
             {
                 names.remove(test.getAdapterName());
-                test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             test = TestIntfPrxHelper.uncheckedCast(test.ice_endpointSelection(Ice.EndpointSelectionType.Random));
@@ -467,7 +467,7 @@ public class AllTests
             while(!names.isEmpty())
             {
                 names.remove(test.getAdapterName());
-                test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             deactivate(com, adapters);
@@ -531,11 +531,11 @@ public class AllTests
             adapters.add(com.createObjectAdapter("Adapter36", endpoints[2].toString()));
             for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter36"); i++);
             test(i == nRetry);
-            test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             adapters.add(com.createObjectAdapter("Adapter35", endpoints[1].toString()));
             for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter35"); i++);
             test(i == nRetry);
-            test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             adapters.add(com.createObjectAdapter("Adapter34", endpoints[0].toString()));
             for(i = 0; i < nRetry && test.getAdapterName().equals("Adapter34"); i++);
             test(i == nRetry);
@@ -832,7 +832,7 @@ public class AllTests
                 for(i = 0; i < 5; i++)
                 {
                     test(test.getAdapterName().equals("Adapter82"));
-                    test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
 
                 TestIntfPrx testSecure = TestIntfPrxHelper.uncheckedCast(test.ice_secure(true));
@@ -848,7 +848,7 @@ public class AllTests
                 for(i = 0; i < 5; i++)
                 {
                     test(test.getAdapterName().equals("Adapter81"));
-                    test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
 
                 com.createObjectAdapter("Adapter83", (test.ice_getEndpoints()[1]).toString()); // Reactive tcp OA.
@@ -856,7 +856,7 @@ public class AllTests
                 for(i = 0; i < 5; i++)
                 {
                     test(test.getAdapterName().equals("Adapter83"));
-                    test.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    test.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
 
                 com.deactivateObjectAdapter(adapters.get(0));
@@ -1051,7 +1051,7 @@ public class AllTests
                 // Close the connection now to free a FD (it could be done after the sleep but
                 // there could be race condiutation since the connection might not be closed
                 // immediately due to threading).
-                test.ice_connectionId("0").ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                test.ice_connectionId("0").ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
                 //
                 // The server closed the acceptor, wait one second and retry after freeing a FD.
diff --git a/java-compat/test/src/main/java/test/Ice/hold/AllTests.java b/java-compat/test/src/main/java/test/Ice/hold/AllTests.java
index bd642b9882f..c7d463780b0 100644
--- a/java-compat/test/src/main/java/test/Ice/hold/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/hold/AllTests.java
@@ -206,7 +206,7 @@ public class AllTests
                 {
                     result.waitForSent();
                     holdSerialized.ice_ping(); // Ensure everything's dispatched
-                    holdSerialized.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                    holdSerialized.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
             }
             result.waitForCompleted();
diff --git a/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java b/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java
index 379c64d1032..a7b95da5a62 100644
--- a/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java
@@ -379,7 +379,7 @@ public class AllTests
             out.flush();
             {
                 final Thread mainThread = Thread.currentThread();
-                p.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                p.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
                 AsyncResult r = p.begin_ice_getConnection();
                 mainThread.interrupt();
@@ -393,7 +393,7 @@ public class AllTests
                     // Expected
                 }
 
-                p.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                p.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
                 final CallbackBase cb = new CallbackBase();
                 mainThread.interrupt();
diff --git a/java-compat/test/src/main/java/test/Ice/location/AllTests.java b/java-compat/test/src/main/java/test/Ice/location/AllTests.java
index f8a3ab46d65..1f12cb72b81 100644
--- a/java-compat/test/src/main/java/test/Ice/location/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/location/AllTests.java
@@ -611,7 +611,7 @@ public class AllTests
         out.flush();
         hello = HelloPrxHelper.checkedCast(communicator.stringToProxy("hello"));
         obj.migrateHello();
-        hello.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+        hello.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
         hello.sayHello();
         obj.migrateHello();
         hello.sayHello();
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java b/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
index 42bb7ee43d7..43b6640077f 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
@@ -28,7 +28,7 @@ public final class AMDMetricsI extends _MetricsDisp
     public void
     fail_async(AMD_Metrics_fail cb, Ice.Current current)
     {
-        current.con.close(Ice.ConnectionClose.CloseForcefully);
+        current.con.close(Ice.ConnectionClose.Forcefully);
         cb.ice_response();
     }
 
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
index 52de5aef9c1..1502df2ec51 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
@@ -313,7 +313,7 @@ public class AllTests
         {
             if(proxy.ice_getCachedConnection() != null)
             {
-                proxy.ice_getCachedConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                proxy.ice_getCachedConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
 
             try
@@ -326,7 +326,7 @@ public class AllTests
 
             if(proxy.ice_getCachedConnection() != null)
             {
-                proxy.ice_getCachedConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+                proxy.ice_getCachedConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             }
         }
 
@@ -545,8 +545,8 @@ public class AllTests
 
         if(!collocated)
         {
-            metrics.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
-            metrics.ice_connectionId("Con1").ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            metrics.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+            metrics.ice_connectionId("Con1").ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             waitForCurrent(clientMetrics, "View", "Connection", 0);
             waitForCurrent(serverMetrics, "View", "Connection", 0);
@@ -649,7 +649,7 @@ public class AllTests
             map = toMap(serverMetrics.getMetricsView("View", timestamp).get("Connection"));
             test(map.get("holding").current == 1);
 
-            metrics.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            metrics.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             map = toMap(clientMetrics.getMetricsView("View", timestamp).get("Connection"));
             test(map.get("closing").current == 1);
@@ -664,7 +664,7 @@ public class AllTests
             props.put("IceMX.Metrics.View.Map.Connection.GroupBy", "none");
             updateProps(clientProps, serverProps, update, props, "Connection");
 
-            metrics.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            metrics.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             metrics.ice_timeout(500).ice_ping();
             controller.hold();
@@ -726,7 +726,7 @@ public class AllTests
             testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "", out);
             testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "", out);
 
-            m.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            m.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             waitForCurrent(clientMetrics, "View", "Connection", 0);
             waitForCurrent(serverMetrics, "View", "Connection", 0);
@@ -746,7 +746,7 @@ public class AllTests
             IceMX.Metrics m1 = clientMetrics.getMetricsView("View", timestamp).get("ConnectionEstablishment")[0];
             test(m1.current == 0 && m1.total == 1 && m1.id.equals(hostAndPort));
 
-            metrics.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            metrics.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             controller.hold();
             try
             {
@@ -806,7 +806,7 @@ public class AllTests
             m1 = clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup")[0];
             test(m1.current <= 1 && m1.total == 1 && m1.id.equals(prx.ice_getConnection().getEndpoint().toString()));
 
-            prx.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            prx.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             boolean dnsException = false;
             try
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java b/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java
index 37a3a440351..394a771ecb0 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java
@@ -27,7 +27,7 @@ public final class MetricsI extends _MetricsDisp
     public void
     fail(Ice.Current current)
     {
-        current.con.close(Ice.ConnectionClose.CloseForcefully);
+        current.con.close(Ice.ConnectionClose.Forcefully);
     }
 
     @Override
diff --git a/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java b/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java
index 5e62fe3c230..4e4780647d6 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java
@@ -120,7 +120,7 @@ class BatchOneways
             batch1.ice_ping();
             batch2.ice_ping();
             batch1.ice_flushBatchRequests();
-            batch1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             batch1.ice_ping();
             batch2.ice_ping();
 
@@ -128,7 +128,7 @@ class BatchOneways
             batch2.ice_getConnection();
 
             batch1.ice_ping();
-            batch1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             batch1.ice_ping();
             batch2.ice_ping();
         }
diff --git a/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java b/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
index 985abb4e945..160cea4ad06 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
@@ -107,7 +107,7 @@ class BatchOnewaysAMI
             batch.begin_ice_ping();
             batch2.begin_ice_ping();
             batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests());
-            batch.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            batch.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             batch.begin_ice_ping();
             batch2.begin_ice_ping();
 
@@ -115,7 +115,7 @@ class BatchOnewaysAMI
             batch2.ice_getConnection();
 
             batch.begin_ice_ping();
-            batch.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            batch.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             batch.begin_ice_ping().throwLocalException();
             batch2.begin_ice_ping().throwLocalException();
         }
diff --git a/java-compat/test/src/main/java/test/Ice/retry/RetryI.java b/java-compat/test/src/main/java/test/Ice/retry/RetryI.java
index ab0d3ec70f7..54e1f76b6b5 100644
--- a/java-compat/test/src/main/java/test/Ice/retry/RetryI.java
+++ b/java-compat/test/src/main/java/test/Ice/retry/RetryI.java
@@ -25,7 +25,7 @@ public final class RetryI extends _RetryDisp
         {
             if(current.con != null)
             {
-                current.con.close(Ice.ConnectionClose.CloseForcefully);
+                current.con.close(Ice.ConnectionClose.Forcefully);
             }
             else
             {
diff --git a/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java b/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
index 28172f950c3..94989f343c3 100644
--- a/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
@@ -329,7 +329,7 @@ public class AllTests
             TimeoutPrx to = TimeoutPrxHelper.checkedCast(obj.ice_timeout(100 * mult));
             Ice.Connection connection = to.ice_getConnection();
             timeout.holdAdapter(500);
-            connection.close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            connection.close(Ice.ConnectionClose.GracefullyWithWait);
             try
             {
                 connection.getInfo(); // getInfo() doesn't throw in the closing state.
diff --git a/java-compat/test/src/main/java/test/Ice/udp/AllTests.java b/java-compat/test/src/main/java/test/Ice/udp/AllTests.java
index 5d000d818d0..b80f309682a 100644
--- a/java-compat/test/src/main/java/test/Ice/udp/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/udp/AllTests.java
@@ -130,7 +130,7 @@ public class AllTests
             {
                 test(seq.length > 16384);
             }
-            obj.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             communicator.getProperties().setProperty("Ice.UDP.SndSize", "64000");
             seq = new byte[50000];
             try
diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
index a13868fbeb8..6ef5389b9a2 100644
--- a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
+++ b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
@@ -891,7 +891,7 @@ public class AllTests
             //
             verifier.reset();
             verifier.returnValue(false);
-            server.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
+            server.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
             try
             {
                 server.ice_ping();