Fixed Ice/timeout test to ensure the client doesn't hang in case of test failure

1 files changed, 20 insertions, 4 deletions

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 eb0abb6b9e1..569281cabf5 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
@@ -151,6 +151,26 @@ public class AllTests
     public static void
     allTests(test.TestHelper helper)
     {
+        ControllerPrx controller = ControllerPrxHelper.checkedCast(
+           helper.communicator().stringToProxy("controller:" + helper.getTestEndpoint(1)));
+        test(controller != null);
+
+        try
+        {
+            allTestsWithController(helper, controller);
+        }
+        catch(Exception ex)
+        {
+            // Ensure the adapter is not in the holding state when an unexpected exception occurs to prevent the test
+            // from hanging on exit in case a connection which disables timeouts is still opened.
+            controller.resumeAdapter();
+            throw ex;
+        }
+    }
+
+    public static void
+    allTestsWithController(test.TestHelper helper, ControllerPrx controller)
+    {
         Ice.Communicator communicator = helper.communicator();
         PrintWriter out = helper.getWriter();
 
@@ -168,10 +188,6 @@ public class AllTests
         TimeoutPrx timeout = TimeoutPrxHelper.checkedCast(obj);
         test(timeout != null);
 
-        ControllerPrx controller = ControllerPrxHelper.checkedCast(
-           communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
-        test(controller != null);
-
         out.print("testing connect timeout... ");
         out.flush();
         {