From 88a791ea0043ffba453cc1388dd3426af36a4464 Mon Sep 17 00:00:00 2001 From: jmehrens Date: Tue, 21 Nov 2023 22:16:19 -0600 Subject: [PATCH] Glassfish can throw IllegalStateException Signed-off-by: jmehrens --- api/src/main/java/jakarta/mail/Session.java | 4 ++-- api/src/main/java/jakarta/mail/util/FactoryFinder.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/jakarta/mail/Session.java b/api/src/main/java/jakarta/mail/Session.java index d87ce8d1..06aed73d 100644 --- 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 index 05658463..9c144941 100644 --- 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 } }