You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/10/13 11:52:17 UTC
svn commit: r1022052 - in /james/server/trunk:
queue-activemq/src/main/java/org/apache/james/queue/activemq/
queue-jms/src/main/java/org/apache/james/queue/jms/
spoolmanager/src/main/java/org/apache/james/transport/
Author: norman
Date: Wed Oct 13 09:52:16 2010
New Revision: 1022052
URL: http://svn.apache.org/viewvc?rev=1022052&view=rev
Log:
Fix bug which let temporary files leak. Now the temporary files get removed again (Bug was introduced lately)
Modified:
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesSpoolManager.java
Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java?rev=1022052&r1=1022051&r2=1022052&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java Wed Oct 13 09:52:16 2010
@@ -197,7 +197,7 @@ public class ActiveMQMailQueue extends J
// Ignore on error
logger.debug("Unable to get url from blobmessage for mail " + mail.getName());
}
- mail.setMessage(new MimeMessageWrapper(new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource(mail.getName(), blobMessage.getInputStream()))));
+ mail.setMessage(new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource(mail.getName(), blobMessage.getInputStream())));
} catch (IOException e) {
throw new MailQueueException("Unable to populate MimeMessage for mail " + mail.getName(), e);
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1022052&r1=1022051&r2=1022052&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java Wed Oct 13 09:52:16 2010
@@ -44,7 +44,6 @@ import org.apache.commons.logging.Log;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
-import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.queue.MailQueue;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -362,7 +361,7 @@ public class JMSMailQueue implements Mai
protected void populateMailMimeMessage(Message message, Mail mail)
throws MessagingException {
if (message instanceof BytesMessage) {
- mail.setMessage(new MimeMessageWrapper(new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource(mail.getName(),new BytesMessageInputStream((BytesMessage) message)))));
+ mail.setMessage(new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource(mail.getName(),new BytesMessageInputStream((BytesMessage) message))));
} else {
throw new MailQueueException("Not supported JMS Message received "+ message);
}
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesSpoolManager.java?rev=1022052&r1=1022051&r2=1022052&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesSpoolManager.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesSpoolManager.java Wed Oct 13 09:52:16 2010
@@ -173,14 +173,12 @@ public class JamesSpoolManager implement
logger.debug(debugBuffer.toString());
}
- mailProcessor.service(mail);
-
- if ((Mail.GHOST.equals(mail.getState())) ||
- (mail.getRecipients() == null) ||
- (mail.getRecipients().size() == 0)) {
+ try {
+ mailProcessor.service(mail);
+ } finally {
LifecycleUtil.dispose(mail);
mail = null;
- }
+ }
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org