Author: rgodfrey
Date: Thu May 14 14:25:33 2015
New Revision: 1679382
URL: http://svn.apache.org/r1679382
Log:
QPID-6541 : Address review comments from Lorenz Quack
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1679382&r1=1679381&r2=1679382&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu May 14 14:25:33 2015
@@ -1068,19 +1068,12 @@ public abstract class AbstractQueue<X ex
{
_enqueuingWhileRecovering.incrementAndGet();
- boolean enqueueImmediately;
+ boolean addedToRecoveryQueue;
try
{
- if(_recovering.get() == RECOVERING)
+ if(addedToRecoveryQueue = (_recovering.get() == RECOVERING))
{
- EnqueueRequest request = new EnqueueRequest(message,
action, enqueueRecord);
- _postRecoveryQueue.add(request);
- // deal with the case the recovering status changed just
as we added to the post recovery queue
- enqueueImmediately = (_recovering.get() != RECOVERING) &&
_postRecoveryQueue.remove(request);
- }
- else
- {
- enqueueImmediately = true;
+ _postRecoveryQueue.add(new EnqueueRequest(message, action,
enqueueRecord));
}
}
finally
@@ -1088,7 +1081,7 @@ public abstract class AbstractQueue<X ex
_enqueuingWhileRecovering.decrementAndGet();
}
- if(enqueueImmediately)
+ if(!addedToRecoveryQueue)
{
while(_recovering.get() != RECOVERED)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
