Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 94657 invoked from network); 16 Feb 2011 22:54:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Feb 2011 22:54:45 -0000 Received: (qmail 92167 invoked by uid 500); 16 Feb 2011 22:54:45 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 92113 invoked by uid 500); 16 Feb 2011 22:54:44 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 92106 invoked by uid 99); 16 Feb 2011 22:54:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Feb 2011 22:54:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Feb 2011 22:54:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 342CA23889B2; Wed, 16 Feb 2011 22:54:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071432 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/transport/stomp/FrameTranslator.java test/java/org/apache/activemq/transport/stomp/StompTest.java Date: Wed, 16 Feb 2011 22:54:24 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110216225424.342CA23889B2@eris.apache.org> Author: tabish Date: Wed Feb 16 22:54:23 2011 New Revision: 1071432 URL: http://svn.apache.org/viewvc?rev=1071432&view=rev Log: fix for: https://issues.apache.org/jira/browse/AMQ-3006 assign default JMS priority when none is set on a Message. Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java?rev=1071432&r1=1071431&r2=1071432&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java Wed Feb 16 22:54:23 2011 @@ -22,9 +22,12 @@ import java.util.Map; import javax.jms.Destination; import javax.jms.JMSException; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.Message; /** * Implementations of this interface are used to map back and forth from Stomp @@ -81,7 +84,7 @@ public interface FrameTranslator { if (message.getOriginalDestination() != null) { headers.put(Stomp.Headers.Message.ORIGINAL_DESTINATION, ft.convertDestination(converter, message.getOriginalDestination())); } - + // now lets add all the message headers final Map properties = message.getProperties(); if (properties != null) { @@ -107,6 +110,8 @@ public interface FrameTranslator { o = headers.remove(Stomp.Headers.Send.PRIORITY); if (o != null) { msg.setJMSPriority(Integer.parseInt((String)o)); + } else { + msg.setJMSPriority(javax.jms.Message.DEFAULT_PRIORITY); } o = headers.remove(Stomp.Headers.Send.TYPE); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java?rev=1071432&r1=1071431&r2=1071432&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java Wed Feb 16 22:54:23 2011 @@ -296,6 +296,27 @@ public class StompTest extends Combinati assertEquals("GroupID", "abc", amqMessage.getGroupID()); } + public void testSendMessageWithNoPriorityReceivesDefault() throws Exception { + + MessageConsumer consumer = session.createConsumer(queue); + + String frame = "CONNECT\n" + "login: system\n" + "passcode: manager\n\n" + Stomp.NULL; + stompConnection.sendFrame(frame); + + frame = stompConnection.receiveFrame(); + assertTrue(frame.startsWith("CONNECTED")); + + frame = "SEND\n" + "correlation-id:c123\n" + "destination:/queue/" + getQueueName() + "\n\n" + "Hello World" + + Stomp.NULL; + + stompConnection.sendFrame(frame); + + TextMessage message = (TextMessage)consumer.receive(2500); + assertNotNull(message); + assertEquals("Hello World", message.getText()); + assertEquals("getJMSPriority", 4, message.getJMSPriority()); + } + public void testReceipts() throws Exception { StompConnection receiver = new StompConnection();