Fix similar error that can be caused by an invalid custom mailer class

uyuni-project · Sep 19, 2023 · 86ac473 · 86ac473
1 parent d0ccdb6
commit 86ac473
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/java/code/src/com/redhat/rhn/domain/notification/UserNotificationFactory.java b/java/code/src/com/redhat/rhn/domain/notification/UserNotificationFactory.java
@@ -78,7 +78,7 @@ private static void configureMailer() {
             mailer = cobj.getDeclaredConstructor().newInstance();
         }
         catch (Throwable e) {
-            log.warn("An exception was thrown while configuring Mailer", e);
+            log.error("An exception was thrown while initializing custom mailer class", e);
             mailer = new SmtpMail();
         }
     }

diff --git a/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java b/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
@@ -52,16 +52,16 @@ public void execute(EventMessage msg) {
      * @return the mailer associated with this class
      */
     protected Mail getMail() {
-        String clazz = Config.get().getString(
-                "web.mailer_class");
+        String clazz = Config.get().getString("web.mailer_class");
         if (clazz == null) {
             return new SmtpMail();
         }
         try {
-            Class cobj = Class.forName(clazz);
-            return (Mail) cobj.newInstance();
+            Class<? extends Mail> cobj = Class.forName(clazz).asSubclass(Mail.class);
+            return cobj.getDeclaredConstructor().newInstance();
         }
-        catch (Exception e) {
+        catch (Throwable e) {
+            getLogger().error("An exception was thrown while initializing custom mailer class", e);
             return new SmtpMail();
         }
     }