Author: rhs
Date: Wed Jun 3 18:54:37 2009
New Revision: 781507
URL: http://svn.apache.org/viewvc?rev=781507&view=rev
Log:
Fixed QPID-1888 for the java broker. Also fixed a bug caught by the new
selector test where message ids were being set to the string 'ID:null' when
message-ids are disabled.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java?rev=781507&r1=781506&r2=781507&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
Wed Jun 3 18:54:37 2009
@@ -63,6 +63,8 @@
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());
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java?rev=781507&r1=781506&r2=781507&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
Wed Jun 3 18:54:37 2009
@@ -124,12 +124,18 @@
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);
+ }
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
