From faee3ec1a6aeeee4936a90265c51d06297a2eabf Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Thu, 24 Mar 2011 07:54:17 -0400
Subject: [PATCH] INT-1839 fixed AbstractMailReceiver to be compliant with
 MailReceiver interface and throw javax.mail.MessagingException

---
 .../integration/mail/AbstractMailReceiver.java              | 6 +-----
 .../integration/mail/ImapMailReceiverTests.java             | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
index 90b02b6a67..fd9c11b15b 100755
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
@@ -219,7 +219,7 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
 		this.folder.open(this.folderOpenMode);
 	}
 	
-	public synchronized Message[] receive() {	
+	public  Message[] receive() throws javax.mail.MessagingException{	
 		synchronized (this.initializationMonitor) {
 			try {
 				this.openFolder();
@@ -281,10 +281,6 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
 				}
 				return copiedMessages.toArray(new Message[]{});
 			}
-			catch (Exception e) {
-				throw new org.springframework.integration.MessagingException(
-						"failure occurred while receiving from folder", e);
-			}
 			finally {
 				MailTransportUtils.closeFolder(this.folder, this.shouldDeleteMessages);
 			}
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
index 518f803dac..774a9bc997 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
@@ -46,7 +46,6 @@ import org.mockito.stubbing.Answer;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.MessagingException;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.PollableChannel;
@@ -418,7 +417,7 @@ public class ImapMailReceiverTests {
 				public void run(){
 					try {
 						receiver.receive();
-					} catch (MessagingException e) {
+					} catch (javax.mail.MessagingException e) {
 						if (e.getCause() instanceof NullPointerException){
 							e.printStackTrace();
 							failed.getAndIncrement();