updating ShutdownManager calls after bootique/bootique#346

bootique · Dec 6, 2023 · 636e637 · 636e637
1 parent 9146659
commit 636e637
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/bootique-simplejavamail-jakarta/src/main/java/io/bootique/simplejavamail/MailerFactory.java b/bootique-simplejavamail-jakarta/src/main/java/io/bootique/simplejavamail/MailerFactory.java
@@ -87,8 +87,7 @@ public Mailer createMailer(CustomMailer customMailer, boolean disabled, Shutdown
         }
 
         Mailer mailer = builder.buildMailer();
-        shutdownManager.addShutdownHook(() -> mailer.shutdownConnectionPool());
-        return mailer;
+        return shutdownManager.onShutdown(mailer, Mailer::shutdownConnectionPool);
     }
 
     @BQConfigProperty("SMTP server used for mail delivery. '127.0.0.1' by default")

diff --git a/bootique-simplejavamail/src/main/java/io/bootique/simplejavamail/MailerFactory.java b/bootique-simplejavamail/src/main/java/io/bootique/simplejavamail/MailerFactory.java
@@ -89,8 +89,7 @@ public Mailer createMailer(CustomMailer customMailer, boolean disabled, Shutdown
         }
 
         Mailer mailer = builder.buildMailer();
-        shutdownManager.addShutdownHook(() -> mailer.shutdownConnectionPool());
-        return mailer;
+        return shutdownManager.onShutdown(mailer, Mailer::shutdownConnectionPool);
     }
 
     @BQConfigProperty("SMTP server used for mail delivery. '127.0.0.1' by default")