Author: rgodfrey
Date: Tue Feb 21 00:57:50 2012
New Revision: 1291542
URL: http://svn.apache.org/viewvc?rev=1291542&view=rev
Log:
QPID-3861 : Run Python Message Grouping tests against the Java Broker; also fix
small bug this uncovers
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1291542&r1=1291541&r2=1291542&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Tue Feb 21 00:57:50 2012
@@ -1895,7 +1895,7 @@ public class SimpleAMQQueue implements A
if(context != null)
{
QueueEntry releasedNode = context.getReleasedEntry();
- return releasedNode == null || releasedNode.compareTo(entry) < 0;
+ return releasedNode != null && releasedNode.compareTo(entry) < 0;
}
else
{
Modified: qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1291542&r1=1291541&r2=1291542&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
(original)
+++ qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes Tue
Feb 21 00:57:50 2012
@@ -22,12 +22,14 @@
#The broker does not support DTX
qpid_tests.broker_0_10.dtx.*
-#The broker does not support message groups
-qpid_tests.broker_0_10.msg_groups.*
-
#The broker does not have the appropriate QMF support
qpid_tests.broker_0_10.management.*
qpid_tests.broker_0_10.stats.BrokerStatsTests.*
+qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_default_group_id
+qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_move_*
+qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_purge_*
+qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_query
+qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_reroute
#The broker does not use the same threshold alerting system (or the QMF
support needed for the tests)
qpid_tests.broker_0_10.threshold.*
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
