Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1A8D966A for ; Mon, 28 Nov 2011 23:20:31 +0000 (UTC) Received: (qmail 81193 invoked by uid 500); 28 Nov 2011 23:20:31 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 81162 invoked by uid 500); 28 Nov 2011 23:20:31 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 81155 invoked by uid 99); 28 Nov 2011 23:20:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 23:20:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 23:20:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA9402388847 for ; Mon, 28 Nov 2011 23:20:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1207693 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Date: Mon, 28 Nov 2011 23:20:08 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111128232008.EA9402388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Mon Nov 28 23:20:07 2011 New Revision: 1207693 URL: http://svn.apache.org/viewvc?rev=1207693&view=rev Log: https://issues.apache.org/jira/browse/AMQ-2868 - fix issue with blocked transaction completion in highly concurrent systems. It was possible to miss an after completion callback Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1207693&r1=1207692&r2=1207693&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Mon Nov 28 23:20:07 2011 @@ -1061,6 +1061,10 @@ public abstract class MessageDatabase ex } } if (inflightTx == null) { + if (after != null) { + // since we don't push this after and we may find another, lets run it now + after.run(); + } return; }