Author: norman
Date: Fri Nov 12 19:05:35 2010
New Revision: 1034522
URL: http://svn.apache.org/viewvc?rev=1034522&view=rev
Log:
Don't copy the message payload when move from one queue to an other (JAMES-1128)
Modified:
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.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=1034522&r1=1034521&r2=1034522&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
Fri Nov 12 19:05:35 2010
@@ -181,7 +181,7 @@ public class ActiveMQMailQueue extends J
String fromQueue = (String)
mail.getAttribute(JAMES_QUEUE_NAME);
MimeMessageWrapper mwrapper = (MimeMessageWrapper) wrapper;
- if (blobUrl != null && fromQueue != null &&
fromQueue.equals(queuename) && mwrapper.isModified() == false ) {
+ if (blobUrl != null && fromQueue != null &&
mwrapper.isModified() == false ) {
// the message content was not changed so don't need
to upload it again and can just point to the url
blobMessage = amqSession.createBlobMessage(blobUrl);
Modified:
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java?rev=1034522&r1=1034521&r2=1034522&view=diff
==============================================================================
---
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
(original)
+++
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
Fri Nov 12 19:05:35 2010
@@ -142,9 +142,8 @@ public class FileSystemBlobStrategy impl
* @throws FileNotFoundException
*/
protected File getFile(ActiveMQBlobMessage message) throws JMSException,
FileNotFoundException {
- String queueName = message.getStringProperty(JAMES_QUEUE_NAME);
String mailname = message.getStringProperty(JAMES_MAIL_NAME);
- String queueUrl = policy.getUploadUrl() + "/" + queueName + "/";
+ String queueUrl = policy.getUploadUrl() + "/";
File queueF = fs.getFile(queueUrl);
// check if we need to create the queue folder
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
