Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 99565 invoked from network); 28 Jul 2004 02:22:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 28 Jul 2004 02:22:55 -0000 Received: (qmail 14661 invoked by uid 500); 28 Jul 2004 02:22:55 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14466 invoked by uid 500); 28 Jul 2004 02:22:54 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14453 invoked by uid 500); 28 Jul 2004 02:22:54 -0000 Delivered-To: apmail-incubator-geronimo-cvs@apache.org Received: (qmail 14448 invoked by uid 99); 28 Jul 2004 02:22:54 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 27 Jul 2004 19:22:53 -0700 Received: (qmail 99561 invoked by uid 1782); 28 Jul 2004 02:22:53 -0000 Date: 28 Jul 2004 02:22:53 -0000 Message-ID: <20040728022253.99560.qmail@minotaur.apache.org> From: gdamour@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager RecoveryImpl.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gdamour 2004/07/27 19:22:53 Modified: modules/transaction/src/java/org/apache/geronimo/transaction/manager RecoveryImpl.java Log: Tests that at least one transaction branch has been removed prior to log the committed event. Indeed, if all the branches have been processed and if no branch has been removed, then the committed event has already been logged. Revision Changes Path 1.5 +2 -2 incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/RecoveryImpl.java Index: RecoveryImpl.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/RecoveryImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RecoveryImpl.java 27 Jul 2004 03:52:15 -0000 1.4 +++ RecoveryImpl.java 28 Jul 2004 02:22:53 -0000 1.5 @@ -152,7 +152,7 @@ if (warn && removed == 0) { log.error("XAResource named: " + name + " returned branch xid for xid: " + xidBranchesPair.getXid() + " but was not registered with that transaction!"); } - if (xidBranchesPair.getBranches().isEmpty()) { + if (xidBranchesPair.getBranches().isEmpty() && 0 != removed ) { try { ourXids.remove(new ByteArrayWrapper(xidBranchesPair.getXid().getGlobalTransactionId())); txLog.commit(xidBranchesPair.getXid(), xidBranchesPair.getMark());