From 927caa28e0570cf2b223388a4290ff899ce5a358 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Mon, 20 Jun 2011 22:30:35 +0000 Subject: QPID-3273 The JMS delivery mode is now used evaluated as a string instead of an integer. Added a test case to cover the JIRA. There was an existing test case (testUsingOnMessage) that had delivery mode in it's selector, but for some reason it was commented out. I decided to add a new one as I was not sure why the delivery mode was taken out of the selector in that test case. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1137804 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/filter/PropertyExpression.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'java/broker/src') diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java index 11fdeae2b1..9848f90ea9 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java +++ b/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java @@ -37,8 +37,8 @@ import org.apache.qpid.server.queue.Filterable; public class PropertyExpression implements Expression { // Constants - defined the same as JMS - private static final int NON_PERSISTENT = 1; - private static final int PERSISTENT = 2; + private static enum JMSDeliveryMode { NON_PERSISTENT, PERSISTENT } + private static final int DEFAULT_PRIORITY = 4; private static final Logger _logger = org.apache.log4j.Logger.getLogger(PropertyExpression.class); @@ -172,13 +172,14 @@ public class PropertyExpression implements Expression { public Object evaluate(Filterable message) { - int mode = message.isPersistent() ? PERSISTENT : NON_PERSISTENT; + JMSDeliveryMode mode = message.isPersistent() ? JMSDeliveryMode.PERSISTENT : + JMSDeliveryMode.NON_PERSISTENT; if (_logger.isDebugEnabled()) { _logger.debug("JMSDeliveryMode is :" + mode); } - return mode; + return mode.toString(); } } -- cgit v1.2.1