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/18 21:12:31 UTC

svn commit: r1023956 - /james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java

Author: norman
Date: Mon Oct 18 19:12:31 2010
New Revision: 1023956

URL: http://svn.apache.org/viewvc?rev=1023956&view=rev
Log:
Set the message priority via the MessageProducer so we are sure its not override

Modified:
    james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java

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=1023956&r1=1023955&r2=1023956&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 Mon Oct 18 19:12:31 2010
@@ -80,7 +80,7 @@ public class JMSMailQueue implements Mai
     /**
      * Handle mail with normal priority (this is the default)
      */
-    public final static int NORMAL_PRIORITY = 5;
+    public final static int NORMAL_PRIORITY = Message.DEFAULT_DELIVERY_MODE;
     
     /**
      * Handle mail with highest priority
@@ -212,9 +212,14 @@ public class JMSMailQueue implements Mai
 			producer = session.createProducer(queue);
 			Message message = createMessage(session, mail, mydelay);
 			populateJMSProperties(message, mail, mydelay);
-			populateJMSHeaders(message, mail);
-			
-			producer.send(message);
+
+			int msgPrio = NORMAL_PRIORITY;
+			Object prio = mail.getAttribute(MAIL_PRIORITY);
+	        if (prio instanceof Integer) {
+	            msgPrio = (Integer) prio;
+	        }
+	        
+			producer.send(message, Message.DEFAULT_DELIVERY_MODE, msgPrio, Message.DEFAULT_TIME_TO_LIVE);
 		} catch (Exception e) {
 			if (session != null) {
 				try {
@@ -334,21 +339,7 @@ public class JMSMailQueue implements Mai
         
     }
     
-    /**
-     * Populate the JMS Message Headers from the given {@link Mail}
-     * 
-     * @param message
-     * @param mail
-     * @throws JMSException
-     * @throws MessagingException
-     */
-    protected void populateJMSHeaders(Message message, Mail mail) throws JMSException, MessagingException {
-    	Object prio = mail.getAttribute(MAIL_PRIORITY);
-    	if (prio instanceof Integer) {
-        	message.setJMSPriority((Integer) prio);
-    	}
-    }
-    
+
     /**
      * Create the complete Mail from the JMS Message. So the created {@link Mail} is completly populated
      * 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org