Repository: activemq-artemis Updated Branches: refs/heads/master 44c02be82 -> bfa3b27cf
ARTEMIS-480 BridgeReconnectTest.testDeliveringCountOnBridgeConnectionFailure fails due to racing condition Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e378e4f8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e378e4f8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e378e4f8 Branch: refs/heads/master Commit: e378e4f88f67a9a3fdf060e8a386dc810e8adec6 Parents: 44c02be Author: Ingo Weiss <[email protected]> Authored: Wed Apr 13 12:42:38 2016 +0100 Committer: Clebert Suconic <[email protected]> Committed: Mon Apr 18 17:59:44 2016 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e378e4f8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java index 268c8cd..45df584 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java @@ -727,6 +727,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled // We remove this reference as we are returning busy which means the reference will never leave the Queue. // because of this we have to remove the reference here refs.remove(message.getMessageID()); + + // The delivering count should also be decreased as to avoid inconsistencies + ((QueueImpl) ref.getQueue()).decDelivering(); } connectionFailed(e, false);
