浏览代码

fix issue #611 - 5019 error during change password when no email server configuerd

Jason Rivard 4 年之前
父节点
当前提交
41d179ead0
共有 1 个文件被更改,包括 5 次插入11 次删除
  1. 5 11
      server/src/main/java/password/pwm/svc/email/EmailService.java

+ 5 - 11
server/src/main/java/password/pwm/svc/email/EmailService.java

@@ -23,7 +23,6 @@ package password.pwm.svc.email;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.Transport;
-
 import password.pwm.PwmApplication;
 import password.pwm.PwmApplicationMode;
 import password.pwm.bean.EmailItemBean;
@@ -358,7 +357,11 @@ public class EmailService implements PwmService
             return;
         }
 
-        checkIfServiceIsOpen();
+        if ( status != STATUS.OPEN )
+        {
+            LOGGER.trace( () -> "email service is closed, discarding email job: " + emailItem.toDebugString() );
+            return;
+        }
 
         submitLock.lock();
         try
@@ -413,15 +416,6 @@ public class EmailService implements PwmService
         statsLogger.conditionallyExecuteTask();
     }
 
-    private void checkIfServiceIsOpen()
-            throws PwmUnrecoverableException
-    {
-        if ( !STATUS.OPEN.equals( status ) )
-        {
-            throw new PwmUnrecoverableException( PwmError.ERROR_SERVICE_NOT_AVAILABLE, "email service is closed and will not accent new jobs" );
-        }
-    }
-
     public static void sendEmailSynchronous(
             final EmailServer emailServer,
             final Configuration configuration,