mirror of https://github.com/apache/activemq.git
resolve https://issues.apache.org/activemq/browse/AMQ-2850, still needs a kahadb variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979775 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
af5d8d154a
commit
5e0e4248de
|
@ -106,6 +106,10 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
|
||||||
if (LOG.isTraceEnabled()) {
|
if (LOG.isTraceEnabled()) {
|
||||||
LOG.trace(destination.getPhysicalName() + " add reference: " + messageId);
|
LOG.trace(destination.getPhysicalName() + " add reference: " + messageId);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if (LOG.isTraceEnabled()) {
|
||||||
|
LOG.trace("no subscribers or duplicate add for: " + messageId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
|
@ -182,8 +186,10 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
|
||||||
if (ackContainer.isEmpty() || subscriberMessages.size() == 1 || isUnreferencedBySubscribers(key, subscriberMessages, messageId)) {
|
if (ackContainer.isEmpty() || subscriberMessages.size() == 1 || isUnreferencedBySubscribers(key, subscriberMessages, messageId)) {
|
||||||
// no message reference held
|
// no message reference held
|
||||||
removeMessage = true;
|
removeMessage = true;
|
||||||
|
// ensure we don't later add a reference
|
||||||
|
dispatchAudit.isDuplicate(messageId);
|
||||||
if (LOG.isDebugEnabled()) {
|
if (LOG.isDebugEnabled()) {
|
||||||
LOG.debug(destination.getPhysicalName() + " remove with no outstanding reference (dup ack): " + messageId);
|
LOG.debug(destination.getPhysicalName() + " remove with no outstanding reference (ack before add): " + messageId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue