Author: orudyy
Date: Thu Nov 3 16:28:29 2016
New Revision: 1767923
URL: http://svn.apache.org/viewvc?rev=1767923&view=rev
Log:
QPID-7489: [Java Broker] Only return false from AbstractQueue#attemptDelivery
iff remaining messages on queue can actually be consumed
merged from trunk using
svn merge -c 1767847 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 3 16:28:29 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767882,1767914
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847,1767882,1767914
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1767923&r1=1767922&r2=1767923&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu Nov 3 16:28:29 2016
@@ -2335,7 +2335,7 @@ public abstract class AbstractQueue<X ex
}
}
- atTail = (node == null) || (getEntries().next(node) == null);
+ atTail = (node == null) || (getNextAvailableEntry(sub) == null);
}
return atTail || !subActive;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
