Do not short-circuit based on class type or message in ErrorAction.eq…

…uals if a ProxyException is involved
jenkinsci · May 16, 2024 · c27b80b · c27b80b
1 parent 7c6165a
commit c27b80b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/actions/ErrorAction.java b/src/main/java/org/jenkinsci/plugins/workflow/actions/ErrorAction.java
@@ -176,9 +176,11 @@ public String getUrlName() {
     public static boolean equals(Throwable t1, Throwable t2) {
         if (t1 == t2) {
             return true;
-        } else if (t1.getClass() != t2.getClass()) {
+        }
+        boolean noProxy = t1.getClass() != ProxyException.class && t2.getClass() != ProxyException.class;
+        if (noProxy && t1.getClass() != t2.getClass()) {
             return false;
-        } else if (!Objects.equals(t1.getMessage(), t2.getMessage())) {
+        } else if (noProxy && !Objects.equals(t1.getMessage(), t2.getMessage())) {
             return false;
         } else {
             String id1 = findId(t1, new HashSet<>());