Author: lquack
Date: Mon Nov 21 13:54:34 2016
New Revision: 1770688
URL: http://svn.apache.org/viewvc?rev=1770688&view=rev
Log:
QPID-7514: [Java Broker] replace previous fix with the proper one
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.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=1770688&r1=1770687&r2=1770688&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
Mon Nov 21 13:54:34 2016
@@ -1263,11 +1263,11 @@ public abstract class AbstractQueue<X ex
{
if(QueueContext._releasedUpdater.compareAndSet(subContext,
oldEntry, entry))
{
+ notifyConsumer(sub);
break;
}
}
}
- notifyConsumer(sub);
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java?rev=1770688&r1=1770687&r2=1770688&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
Mon Nov 21 13:54:34 2016
@@ -79,13 +79,13 @@ public class DefinedGroupMessageGroupMan
}
if(--_activeCount == 0)
{
+ _groupMap.remove(_group);
if(!_skippedEntries.isEmpty())
{
_resetHelper.resetSubPointersForGroups(_skippedEntries.first());
_skippedEntries.clear();
}
_consumer = null;
- _groupMap.remove(_group);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
