diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java | 2 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java | 10 |
2 files changed, 10 insertions, 2 deletions
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 b30c70dac3..946274f936 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 @@ -63,6 +63,8 @@ public class PropertyExpression<E extends Exception> implements Expression<E> JMS_PROPERTY_EXPRESSIONS.put("JMSPriority", new PriorityExpression()); + JMS_PROPERTY_EXPRESSIONS.put("JMSMessageID", new MessageIDExpression()); + JMS_PROPERTY_EXPRESSIONS.put("AMQMessageID", new MessageIDExpression()); JMS_PROPERTY_EXPRESSIONS.put("JMSTimestamp", new TimestampExpression()); diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java index d053b8af80..902de08d3f 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java @@ -124,12 +124,18 @@ public class AMQMessageDelegate_0_8 implements AMQMessageDelegate public void setJMSMessageID(String messageId) throws JMSException { - getContentHeaderProperties().setMessageId(messageId); + if (messageId != null) + { + getContentHeaderProperties().setMessageId(messageId); + } } public void setJMSMessageID(UUID messageId) throws JMSException { - getContentHeaderProperties().setMessageId("ID:" + messageId); + if (messageId != null) + { + getContentHeaderProperties().setMessageId("ID:" + messageId); + } } |