You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/08/07 07:08:23 UTC
svn commit: r801884 - in /camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/JmsConfiguration.java
test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
Author: davsclaus
Date: Fri Aug 7 05:08:23 2009
New Revision: 801884
URL: http://svn.apache.org/viewvc?rev=801884&view=rev
Log:
CAMEL-1867: Fixed setting JMSPriority as header also working for 0 as value. Thanks to Siegfried Wirth for reporting.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=801884&r1=801883&r2=801884&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Fri Aug 7 05:08:23 2009
@@ -250,8 +250,8 @@
}
int priority = message.getJMSPriority();
- if (priority <= 0) {
- // use prioriry from endpoint if not provided on message
+ if (priority < 0 || priority > 9) {
+ // use prioriry from endpoint if not provided on message with a valid range
priority = this.getPriority();
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java?rev=801884&r1=801883&r2=801884&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java Fri Aug 7 05:08:23 2009
@@ -48,36 +48,45 @@
}
@Test
- public void testInOnlyJMSPrioritoryTheDeliveryModeIsDefault() throws Exception {
+ public void testInOnlyJMSPrioritoryZero() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.message(0).header("JMSPriority").isEqualTo(2);
- // not provided as header but should use endpoint default then
- mock.message(0).header("JMSDeliveryMode").isEqualTo(2);
+ mock.message(0).header("JMSPriority").isEqualTo(0);
- template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSPriority", "2");
+ template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSPriority", "0");
assertMockEndpointsSatisfied();
}
@Test
- public void testInOnlyJMSDeliveryMode() throws Exception {
+ public void testInOnlyJMSPrioritoryNine() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.message(0).header("JMSDeliveryMode").isEqualTo(1);
+ mock.message(0).header("JMSPriority").isEqualTo(9);
- template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSDeliveryMode", "1");
+ template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSPriority", "9");
assertMockEndpointsSatisfied();
}
@Test
- public void testInOnlyJMSDeliveryModeThenPriorityIsDefault() throws Exception {
+ public void testInOnlyJMSPrioritoryTheDeliveryModeIsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.message(0).header("JMSDeliveryMode").isEqualTo(1);
+ mock.message(0).header("JMSPriority").isEqualTo(2);
// not provided as header but should use endpoint default then
- mock.message(0).header("JMSPriority").isEqualTo(4);
+ mock.message(0).header("JMSDeliveryMode").isEqualTo(2);
+
+ template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSPriority", "2");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testInOnlyJMSDeliveryMode() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).header("JMSDeliveryMode").isEqualTo(1);
template.sendBodyAndHeader("activemq:queue:foo?preserveMessageQos=true", "Hello World", "JMSDeliveryMode", "1");