Author: robbie
Date: Fri Apr 10 20:00:52 2009
New Revision: 764026
URL: http://svn.apache.org/viewvc?rev=764026&view=rev
Log:
QPID-1798: Update AMQQueueMBean to use new constant value of DeliveryMode,
replacing previously incorrect literal value used in conditional statement and
thus preventing the reversal of delivery mode status. Also update other broker
classes making similar comparisons using a literal value to use a constant
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java?rev=764026&r1=764025&r2=764026&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
Fri Apr 10 20:00:52 2009
@@ -443,7 +443,8 @@
list.add("JMSCorrelationID = " +
headerProperties.getCorrelationIdAsString());
int delMode = headerProperties.getDeliveryMode();
- list.add("JMSDeliveryMode = " + ((delMode == 1) ? "Persistent" :
"Non_Persistent"));
+ list.add("JMSDeliveryMode = " +
+ ((delMode == BasicContentHeaderProperties.PERSISTENT) ?
"Persistent" : "Non_Persistent"));
list.add("JMSPriority = " + headerProperties.getPriority());
list.add("JMSType = " + headerProperties.getType());
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java?rev=764026&r1=764025&r2=764026&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
Fri Apr 10 20:00:52 2009
@@ -116,7 +116,8 @@
mmd.setArrivalTime(arrivaltime);
AMQMessage message;
- if (((BasicContentHeaderProperties)
chb.properties).getDeliveryMode() == 2)
+ if (((BasicContentHeaderProperties)
chb.properties).getDeliveryMode() ==
+
BasicContentHeaderProperties.PERSISTENT)
{
message = new PersistentAMQMessage(messageId, null);
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java?rev=764026&r1=764025&r2=764026&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
Fri Apr 10 20:00:52 2009
@@ -265,9 +265,9 @@
public boolean isPersistent()
{
- //todo remove literal values to a constant file such as AMQConstants
in common
return getContentHeaderBody().properties instanceof
BasicContentHeaderProperties &&
- ((BasicContentHeaderProperties)
getContentHeaderBody().properties).getDeliveryMode() == 2;
+ ((BasicContentHeaderProperties)
getContentHeaderBody().properties).getDeliveryMode() ==
+
BasicContentHeaderProperties.PERSISTENT;
}
public boolean isRedelivered()
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java?rev=764026&r1=764025&r2=764026&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
Fri Apr 10 20:00:52 2009
@@ -120,8 +120,8 @@
public boolean isPersistent()
{
- //todo remove literal values to a constant file such as AMQConstants
in common
return _contentHeaderBody.properties instanceof
BasicContentHeaderProperties &&
- ((BasicContentHeaderProperties)
_contentHeaderBody.properties).getDeliveryMode() == 2;
+ ((BasicContentHeaderProperties)
_contentHeaderBody.properties).getDeliveryMode() ==
+
BasicContentHeaderProperties.PERSISTENT;
}
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java?rev=764026&r1=764025&r2=764026&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
Fri Apr 10 20:00:52 2009
@@ -27,6 +27,10 @@
public class BasicContentHeaderProperties implements
CommonContentHeaderProperties
{
+ //persistent & non-persistent constants, values as per JMS DeliveryMode
+ public static final int NON_PERSISTENT = 1;
+ public static final int PERSISTENT = 2;
+
private static final Logger _logger =
LoggerFactory.getLogger(BasicContentHeaderProperties.class);
private static final AMQShortString ZERO_STRING = null;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
