Revert "update send email to async"

This reverts commit 4b4f5a9.

Author: xxcxy

src/main/java/com/cronos/onlinereview/actions/latedeliverables/SaveLateDeliverableAction.java

@@ -353,7 +353,7 @@ private void sendEmailForUsers(Project project, List<String> recipients, List<St
             message.addToAddress(ccRecipient, TCSEmailMessage.CC);
         }
         message.setContentType("text/html");
-        ActionsHelper.sendEmail(message);
+        EmailEngine.send(message);
     }
 
     /**

src/main/java/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java

@@ -846,7 +846,7 @@ private void notifyIterativeReviewers(Project project, long submissionId, String
             message.addToAddress(recipient, TCSEmailMessage.TO);
         }
         message.setContentType("text/html");
-        ActionsHelper.sendEmail(message);
+        EmailEngine.send(message);
     }
 
     /**

src/main/java/com/cronos/onlinereview/actions/projectdetails/ContactManagerAction.java

@@ -187,7 +187,7 @@ public String execute() throws BaseException, ConfigManagerException {
         message.setContentType("text/html");
 
         // Send an email
-        ActionsHelper.sendEmail(message);
+        EmailEngine.send(message);
         setPid(project.getId());
 
         return Constants.SUCCESS_FORWARD_NAME;

src/main/java/com/cronos/onlinereview/phases/ReviewResultNotification.java

@@ -6,7 +6,6 @@
 import java.text.MessageFormat;
 
 import com.cronos.onlinereview.external.ExternalUser;
-import com.cronos.onlinereview.util.ActionsHelper;
 import com.topcoder.management.deliverable.Submission;
 import com.topcoder.management.deliverable.UploadManager;
 import com.topcoder.management.phase.PhaseHandlingException;
@@ -110,7 +109,7 @@ private void sendWinnersEmailForUser(Project project, ExternalUser user, String
         message.setBody(emailContent);
         message.setFromAddress(winnersEmailFromAddress);
         message.setToAddress(user.getEmail(), TCSEmailMessage.TO);
-        ActionsHelper.sendEmail(message);
+        EmailEngine.send(message);
     }
 
     private Resource getResourceForProjectAndUser(Project project, Long userId) throws PhaseManagementException {

src/main/java/com/cronos/onlinereview/phases/ScreeningResultNotification.java

@@ -10,7 +10,6 @@
 
 import com.cronos.onlinereview.external.ExternalUser;
 import com.cronos.onlinereview.external.UserRetrieval;
-import com.cronos.onlinereview.util.ActionsHelper;
 import com.topcoder.management.deliverable.Submission;
 import com.topcoder.management.deliverable.SubmissionStatus;
 import com.topcoder.management.deliverable.SubmissionType;
@@ -221,7 +220,7 @@ private void sendEmailForUser(Project project, ExternalUser user, Submission sub
         message.setFromAddress(emailFromAddress);
         message.setToAddress(user.getEmail(), TCSEmailMessage.TO);
         message.setContentType("text/html");
-        ActionsHelper.sendEmail(message);
+        EmailEngine.send(message);
     }
 
     /**

src/main/java/com/cronos/onlinereview/util/ActionsHelper.java

@@ -29,8 +29,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import com.amazonaws.auth.PropertiesCredentials;
 import com.amazonaws.services.s3.AmazonS3Client;
@@ -106,9 +104,6 @@
 import com.topcoder.management.scorecard.data.Group;
 import com.topcoder.management.scorecard.data.Scorecard;
 import com.topcoder.management.scorecard.data.Section;
-import com.topcoder.message.email.EmailEngine;
-import com.topcoder.message.email.SendingException;
-import com.topcoder.message.email.TCSEmailMessage;
 import com.topcoder.project.phases.Dependency;
 import com.topcoder.project.phases.Phase;
 import com.topcoder.project.phases.PhaseStatus;
@@ -128,7 +123,6 @@
 import com.topcoder.servlet.request.LocalFileUpload;
 import com.topcoder.shared.util.ApplicationServer;
 import com.topcoder.shared.util.TCContext;
-import com.topcoder.util.config.ConfigManagerException;
 import com.topcoder.util.errorhandling.BaseException;
 import com.topcoder.util.errorhandling.BaseRuntimeException;
 import com.topcoder.util.log.Level;
@@ -228,8 +222,6 @@ public class ActionsHelper {
      */
     public static final String LOCAL_STUDIO_STORAGE_NAMESPACE = "com.topcoder.servlet.request.LocalStudioFileUpload";
 
-    private static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(50);
-
     /**
      * AWS S3 client
      */
@@ -3886,19 +3878,4 @@ public static String createStudioLocalFilePath(long projectId, long userId, Stri
         buf.append(parameter);
         return buf.toString();
     }
-
-    public static void sendEmail(final TCSEmailMessage message) {
-        THREAD_POOL.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    EmailEngine.send(message);
-                } catch (ConfigManagerException e) {
-                    log.log(Level.ERROR, "Send email with config error: " + e.getMessage());
-                } catch (SendingException e) {
-                    log.log(Level.ERROR, "Send email with sending error: " + e.getMessage());
-                }
-            }
-        });
-    }
 }