Author: dkuleshov Date: 2012-02-15 04:40:04 -0500 (Wed, 15 Feb 2012) New Revision: 5637 Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/MailService.java kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/impl/MailServiceImpl.java kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java Log: EXOJCR-1733: small fixes Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/MailService.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/MailService.java 2012-02-15 08:09:48 UTC (rev 5636) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/MailService.java 2012-02-15 09:40:04 UTC (rev 5637) @@ -87,7 +87,7 @@ * @param body - {@link String} contents of mail message * @return {@link Future} object to watch the result of asynchronous calculation */ - public Future<Boolean> sendMessageAsynch(String from, String to, String subject, String body); + public Future<Boolean> sendMessageInFuture(String from, String to, String subject, String body); /** * Asynchronous variant of {@link MailService#sendMessage(Message)}. @@ -99,7 +99,7 @@ * @param message - {@link Message} provides mail message related data (e.g. subject, content etc.) * @return {@link Future} object to watch the result of asynchronous calculation */ - public Future<Boolean> sendMessageAsynch(Message message); + public Future<Boolean> sendMessageInFuture(Message message); /** * Asynchronous variant of {@link MailService#sendMessage(MimeMessage)}. @@ -111,5 +111,5 @@ * @param message - {@link MimeMessage} provides mail message related data (e.g. subject, content etc.) * @return {@link Future} object to watch the result of asynchronous calculation */ - public Future<Boolean> sendMessageAsynch(MimeMessage message); + public Future<Boolean> sendMessageInFuture(MimeMessage message); } Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/impl/MailServiceImpl.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/impl/MailServiceImpl.java 2012-02-15 08:09:48 UTC (rev 5636) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/main/java/org/exoplatform/services/mail/impl/MailServiceImpl.java 2012-02-15 09:40:04 UTC (rev 5637) @@ -21,6 +21,7 @@ import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.xml.InitParams; import org.exoplatform.services.mail.Attachment; import org.exoplatform.services.mail.MailService; @@ -35,7 +36,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; import java.util.concurrent.ThreadFactory; import javax.activation.DataHandler; @@ -83,7 +83,7 @@ */ private static volatile int mailServiceThreadCounter = 0; - public MailServiceImpl(InitParams params) throws Exception + public MailServiceImpl(InitParams params, final ExoContainerContext ctx) throws Exception { props_ = new Properties(PrivilegedSystemHelper.getProperties()); props_.putAll(params.getPropertiesParam("config").getProperties()); @@ -118,7 +118,7 @@ { public Thread newThread(Runnable arg0) { - return new Thread(arg0, "MailServiceThread-" + mailServiceThreadCounter++); + return new Thread(arg0, ctx.getName() + "-MailServiceThread-" + mailServiceThreadCounter++); } }); } @@ -255,10 +255,10 @@ * {@inheritDoc} */ @Override - public Future<Boolean> sendMessageAsynch(final String from, final String to, final String subject, + public Future<Boolean> sendMessageInFuture(final String from, final String to, final String subject, final String body) { - FutureTask<Boolean> ft = new FutureTask<Boolean>(new Callable<Boolean>() + return executorService.submit(new Callable<Boolean>() { @Override public Boolean call() throws Exception @@ -267,18 +267,15 @@ return true; } }); - - executorService.execute(ft); - return ft; } /** * {@inheritDoc} */ @Override - public Future<Boolean> sendMessageAsynch(final Message message) + public Future<Boolean> sendMessageInFuture(final Message message) { - FutureTask<Boolean> ft = new FutureTask<Boolean>(new Callable<Boolean>() + return executorService.submit(new Callable<Boolean>() { @Override public Boolean call() throws Exception @@ -287,18 +284,15 @@ return true; } }); - - executorService.execute(ft); - return ft; } /** * {@inheritDoc} */ @Override - public Future<Boolean> sendMessageAsynch(final MimeMessage message) + public Future<Boolean> sendMessageInFuture(final MimeMessage message) { - FutureTask<Boolean> ft = new FutureTask<Boolean>(new Callable<Boolean>() + return executorService.submit(new Callable<Boolean>() { @Override public Boolean call() throws Exception @@ -307,9 +301,6 @@ return true; } }); - - executorService.execute(ft); - return ft; } protected String[] getArrs(String toArray) Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java 2012-02-15 08:09:48 UTC (rev 5636) +++ kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java 2012-02-15 09:40:04 UTC (rev 5637) @@ -209,7 +209,7 @@ } Future<Boolean> future = - service.sendMessageAsynch("!@#$%^&*()", generateRandomEmailSender(), MAIL_SUBJECT, MAIL_CONTENTS); + service.sendMessageInFuture("!@#$%^&*()", generateRandomEmailSender(), MAIL_SUBJECT, MAIL_CONTENTS); try { @@ -246,7 +246,7 @@ { assertFalse(isEmailMessageSent(MAIL_SUBJECT + i)); futures[i] = - service.sendMessageAsynch(generateRandomEmailSender(), generateRandomEmailRecipient(), MAIL_SUBJECT + i, + service.sendMessageInFuture(generateRandomEmailSender(), generateRandomEmailRecipient(), MAIL_SUBJECT + i, MAIL_CONTENTS + i); } @@ -287,7 +287,7 @@ message.setContent(MAIL_CONTENTS, TEXT_PLAIN); message.setFlags(flags, true); - Future<Boolean> future = service.sendMessageAsynch(message); + Future<Boolean> future = service.sendMessageInFuture(message); try { @@ -334,7 +334,7 @@ message.setContent(MAIL_CONTENTS + i, TEXT_PLAIN); message.setFlags(flags, true); - futures[i] = service.sendMessageAsynch(message); + futures[i] = service.sendMessageInFuture(message); } for (int i = 0; i < THREAD_NUMBER; i++) @@ -373,7 +373,7 @@ message.setMimeType(TEXT_HTML); message.addAttachment(attachment); - Future<Boolean> future = service.sendMessageAsynch(message); + Future<Boolean> future = service.sendMessageInFuture(message); try { @@ -426,7 +426,7 @@ message.setMimeType(TEXT_HTML); message.addAttachment(attachment); - futures[i] = service.sendMessageAsynch(message); + futures[i] = service.sendMessageInFuture(message); assertFalse(futures[i].isDone()); }