Author: rhs
Date: Wed Apr 16 11:03:22 2008
New Revision: 648771
URL: http://svn.apache.org/viewvc?rev=648771&view=rev
Log:
QPID-901: don't depend on constant values matching up when converting between
JMS and AMQP delivery modes
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=648771&r1=648770&r2=648771&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Wed Apr 16 11:03:22 2008
@@ -104,7 +104,19 @@
if (!deliveryProp.hasDeliveryMode() ||
deliveryProp.getDeliveryMode().getValue() != deliveryMode)
{
- deliveryProp.setDeliveryMode(MessageDeliveryMode.get((short)
deliveryMode));
+ MessageDeliveryMode mode;
+ switch (deliveryMode)
+ {
+ case DeliveryMode.PERSISTENT:
+ mode = MessageDeliveryMode.PERSISTENT;
+ break;
+ case DeliveryMode.NON_PERSISTENT:
+ mode = MessageDeliveryMode.NON_PERSISTENT;
+ break;
+ default:
+ throw new IllegalArgumentException("illegal delivery mode: " +
deliveryMode);
+ }
+ deliveryProp.setDeliveryMode(mode);
message.setJMSDeliveryMode(deliveryMode);
}
if (!deliveryProp.hasPriority() ||
deliveryProp.getPriority().getValue() != priority)