Glassfish can throw IllegalStateException

Signed-off-by: jmehrens <[email protected]>
jakartaee · Nov 22, 2023 · 88a791e · 88a791e
1 parent 683898d
commit 88a791e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/jakarta/mail/Session.java b/api/src/main/java/jakarta/mail/Session.java
@@ -1441,8 +1441,8 @@ private static Class<?>[] getHk2ServiceLoaderTargets(Class<?> factoryClass) {
             if (loader != null) {
                 try {
                     classes[w++] = Class.forName("org.glassfish.hk2.osgiresourcelocator.ServiceLoader", false, loader);
-                } catch (ClassNotFoundException | LinkageError ignored) {
-                }
+                } catch (Exception | LinkageError ignored) {
+                }  //GlassFish class loaders can throw undocumented exceptions
             }
         }
 

diff --git a/api/src/main/java/jakarta/mail/util/FactoryFinder.java b/api/src/main/java/jakarta/mail/util/FactoryFinder.java
@@ -120,8 +120,8 @@ private static Class<?>[] getHk2ServiceLoaderTargets(Class<?> factoryClass) {
             if (loader != null) {
                 try {
                     classes[w++] = Class.forName("org.glassfish.hk2.osgiresourcelocator.ServiceLoader", false, loader);
-                } catch (ClassNotFoundException | LinkageError ignored) {  
-                }
+                } catch (Exception | LinkageError ignored) {  
+                } //GlassFish class loaders can throw undocumented exceptions
             }
         }