You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/11/16 11:33:24 UTC
svn commit: r1769960 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
Author: orudyy
Date: Wed Nov 16 11:33:24 2016
New Revision: 1769960
URL: http://svn.apache.org/viewvc?rev=1769960&view=rev
Log:
QPID-7491: [Java Broker] Fix AbstractSystemMessageSource#pullMessage
merged from trunk using
svn merge -c 1767849 ^/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/virtualhost/AbstractSystemMessageSource.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 16 11:33:24 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,1767847-1767848,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java?rev=1769960&r1=1769959&r2=1769960&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java Wed Nov 16 11:33:24 2016
@@ -148,6 +148,34 @@ public abstract class AbstractSystemMess
@Override
public void pullMessage()
{
+ AMQPConnection<?> connection = _target.getSessionModel().getAMQPConnection();
+ _target.getSendLock();
+ try
+ {
+ connection.alwaysAllowMessageAssignmentInThisThreadIfItIsIOThread(true);
+
+ try
+ {
+ if (!_queue.isEmpty())
+ {
+ final PropertiesMessageInstance propertiesMessageInstance = _queue.get(0);
+ if (!_target.isSuspended() && _target.allocateCredit(propertiesMessageInstance.getMessage()))
+ {
+ _queue.remove(0);
+ _target.send(this, propertiesMessageInstance, false);
+ }
+ }
+ }
+ finally
+ {
+ connection.alwaysAllowMessageAssignmentInThisThreadIfItIsIOThread(false);
+ }
+ }
+ finally
+ {
+ _target.releaseSendLock();
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org