Merge branch 'main' into issue/3145/enable-windows-crashdumps-ci

zeroc-ice · Nov 13, 2024 · 761a8b2 · 761a8b2
2 parents 7eed5ab + 4c9de02
commit 761a8b2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/java/src/com.zeroc.ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/com.zeroc.ice/src/main/java/com/zeroc/Ice/ConnectionI.java
@@ -181,8 +181,8 @@ private synchronized void closeImpl() {
                 doApplicationClose();
             } else {
                 _closeRequested = true;
-                scheduleCloseTimer(); // we don't wait forever for outstanding invocations to
-                // complete
+                // we don't wait forever for outstanding invocations to complete
+                scheduleCloseTimer();
             }
         }
         // else nothing else to do, already closing or closed.

diff --git a/java/test/src/main/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java
@@ -14,6 +14,7 @@
 import test.Ice.ami.Test.TestIntfPrx;
 
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -738,11 +739,13 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                 testController.holdAdapter();
                 InvocationFuture<Void> r1;
                 InvocationFuture<Void> r2;
+                var results = new ArrayList<InvocationFuture<Void>>();
                 try {
                     r1 = Util.getInvocationFuture(p.opAsync());
                     byte[] seq = new byte[10024];
                     while (true) {
                         r2 = Util.getInvocationFuture(p.opWithPayloadAsync(seq));
+                        results.add(r2);
                         if (!r2.sentSynchronously()) {
                             break;
                         }
@@ -773,6 +776,8 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
 
                 test(r1.getOperation().equals("op"));
                 test(r2.getOperation().equals("opWithPayload"));
+
+                CompletableFuture.allOf(results.toArray(new CompletableFuture[0])).join();
             }
 
             {
@@ -850,12 +855,14 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                 InvocationFuture<String> r2 = null;
 
                 testController.holdAdapter();
+                var results = new ArrayList<InvocationFuture<Void>>();
                 try {
                     InvocationFuture<Void> r = null;
                     byte[] seq = new byte[10024];
                     for (int i = 0; i < 200; ++i) // 2MB
                     {
                         r = Util.getInvocationFuture(p.opWithPayloadAsync(seq));
+                        results.add(r);
                     }
 
                     test(!r.isSent());
@@ -877,6 +884,9 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                 } finally {
                     testController.resumeAdapter();
                 }
+
+                CompletableFuture.allOf(results.toArray(new CompletableFuture[0])).join();
+
                 p.ice_ping();
                 // test(!r1.isSent() && r1.isDone());
                 test(!r1.isSent());
@@ -912,11 +922,8 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
             out.print("testing connection close... ");
             out.flush();
             {
-                //
                 // Local case: begin a request, close the connection gracefully, and make sure it
-                // waits
-                // for the request to complete.
-                //
+                // waits for the request to complete.
                 com.zeroc.Ice.Connection con = p.ice_getConnection();
                 Callback cb = new Callback();
                 con.setCloseCallback(c -> cb.called());
@@ -935,19 +942,16 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                 //
                 byte[] seq = new byte[1024 * 10];
 
-                //
                 // Send multiple opWithPayload, followed by a close and followed by multiple
                 // opWithPayload.
                 // The goal is to make sure that none of the opWithPayload fail even if the server
-                // closes
-                // the connection gracefully in between.
-                //
+                // closes the connection gracefully in between.
                 int maxQueue = 2;
                 boolean done = false;
                 while (!done && maxQueue < 50) {
                     done = true;
                     p.ice_ping();
-                    java.util.List<InvocationFuture<Void>> results = new java.util.ArrayList<>();
+                    var results = new java.util.ArrayList<>();
                     for (int i = 0; i < maxQueue; ++i) {
                         results.add(Util.getInvocationFuture(p.opWithPayloadAsync(seq)));
                     }
@@ -966,12 +970,11 @@ public static void allTests(test.TestHelper helper, boolean collocated) {
                         maxQueue *= 2;
                         done = false;
                     }
-                    for (InvocationFuture<Void> q : results) {
-                        q.join();
-                    }
+                    CompletableFuture.allOf(results.toArray(new CompletableFuture[0])).join();
+
+                    // Wait until the connection is closed.
+                    p.ice_getCachedConnection().close();
                 }
-                // Wait until the connection is closed.
-                p.ice_getCachedConnection().close();
             }
             out.println("ok");
 

diff --git a/java/test/src/main/java/test/Ice/ami/TestI.java b/java/test/src/main/java/test/Ice/ami/TestI.java
@@ -150,8 +150,7 @@ public void sleep(int ms, com.zeroc.Ice.Current current) {
     public synchronized CompletionStage<Void> startDispatchAsync(com.zeroc.Ice.Current current) {
         if (_shutdown) {
             // Ignore, this can occur with the forceful connection close test, shutdown can be
-            // dispatch
-            // before start dispatch.
+            // dispatch before start dispatch.
             CompletableFuture<Void> v = new CompletableFuture<>();
             v.complete(null);
             return v;

diff --git a/php/lib/.gitignore b/php/lib/.gitignore
@@ -10,4 +10,5 @@ Ice/PropertiesAdmin.php
 Ice/PropertyDict.php
 Ice/RemoteLogger.php
 Ice/Router.php
+Ice/SliceChecksumDict.php
 Ice/Version.php
diff --git a/ruby/ruby/.gitignore b/ruby/ruby/.gitignore
@@ -10,5 +10,6 @@ Ice/PropertiesAdmin.rb
 Ice/PropertyDict.rb
 Ice/RemoteLogger.rb
 Ice/Router.rb
+Ice/SliceChecksumDict.rb
 Ice/Version.rb
 IceRuby.*