commit 95d23382b6aec917d4a8c1fc5be594c40f163080
author Patrick Hiesel <hiesel@google.com> Fri Jul 19 06:25:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 19 06:25:54 2024 +0000
tree b7e57ea98d3a00fc919ed9d2b1d1d36845b09f87
parent acab2799e9dae5c0c8654c24169fe59c8a811099
parent 83c64b6bb7382ae8611196858e8264b371fdb418

Merge "Also check suppressed exceptions when detecting RequestCancelledException"

java/com/google/gerrit/server/cancellation/RequestCancelledException.java

diff --git a/java/com/google/gerrit/server/cancellation/RequestCancelledException.java b/java/com/google/gerrit/server/cancellation/RequestCancelledException.java
index dc01567..9663427 100644
--- a/java/com/google/gerrit/server/cancellation/RequestCancelledException.java
+++ b/java/com/google/gerrit/server/cancellation/RequestCancelledException.java
@@ -15,7 +15,9 @@
 package com.google.gerrit.server.cancellation;
 
 import com.google.common.base.Throwables;
+import com.google.common.collect.Streams;
 import com.google.gerrit.common.Nullable;
+import java.util.Arrays;
 import java.util.Optional;
 import org.apache.commons.text.WordUtils;
 
@@ -28,7 +30,9 @@
    * {@link RequestCancelledException} is returned. If not, {@link Optional#empty()} is returned.
    */
   public static Optional<RequestCancelledException> getFromCausalChain(Throwable e) {
-    return Throwables.getCausalChain(e).stream()
+    return Streams.concat(
+            Throwables.getCausalChain(e).stream(),
+            Throwables.getCausalChain(e).stream().flatMap(t -> Arrays.stream(t.getSuppressed())))
         .filter(RequestCancelledException.class::isInstance)
         .map(RequestCancelledException.class::cast)
         .findFirst();