From e95d9d79f4a89c4695b4affd63e4fcb0968dbb08 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Mar 2024 19:46:05 +0100
Subject: [PATCH] [java] Fix AvoidCatchingGenericException for multi-catch

---
 pmd-java/src/main/resources/category/java/design.xml            | 2 +-
 .../lang/java/rule/design/xml/AvoidCatchingGenericException.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 60397a80d8..307703f4f7 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -62,7 +62,7 @@ Avoid catching generic exceptions such as NullPointerException, RuntimeException
                 <value>
 <![CDATA[
 //CatchParameter[
-    ClassType[
+    (.|UnionType)/ClassType[
         pmd-java:typeIsExactly('java.lang.NullPointerException') or
         pmd-java:typeIsExactly('java.lang.Exception') or
         pmd-java:typeIsExactly('java.lang.RuntimeException')]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
index f1bd6f3bf8..a9df7ec6bb 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
@@ -63,7 +63,7 @@ public class Foo {
 
     <test-code>
         <description>failure case with multi-catch</description>
-        <expected-problems>2</expected-problems>
+        <expected-problems>1</expected-problems>
         <code><![CDATA[
 public class Foo {
     void bar() {