Author: robbie
Date: Fri Apr 17 15:20:15 2009
New Revision: 766047
URL: http://svn.apache.org/viewvc?rev=766047&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.
merged from trunk r764026, as changes were lost during /broker 0.5-fix process.
Excludes changes to sections no longer present, and changes still present in
/common from previous commit.
Modified:
qpid/trunk/qpid/java/broker/ (props changed)
qpid/trunk/qpid/java/broker/bin/ (props changed)
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
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/IncomingMessage.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
Propchange: qpid/trunk/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:20:15 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
Propchange: qpid/trunk/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:20:15 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
Propchange:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:20:15 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management:757268
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
Propchange:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:20:15 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757257
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
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=766047&r1=766046&r2=766047&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 17 15:20:15 2009
@@ -428,7 +428,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/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java?rev=766047&r1=766046&r2=766047&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 17 15:20:15 2009
@@ -282,9 +282,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=766047&r1=766046&r2=766047&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 17 15:20:15 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;
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
