From scm-return-43807-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Aug 11 11:27:24 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 64092 invoked from network); 11 Aug 2010 11:27:24 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Aug 2010 11:27:24 -0000 Received: (qmail 16450 invoked by uid 500); 11 Aug 2010 11:27:24 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 16324 invoked by uid 500); 11 Aug 2010 11:27:21 -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 List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 16316 invoked by uid 99); 11 Aug 2010 11:27:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 11:27:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 11 Aug 2010 11:27:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 607BC238899C; Wed, 11 Aug 2010 11:26:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r984373 - in /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager: CommitTask.java TransactionImpl.java Date: Wed, 11 Aug 2010 11:26:03 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100811112603.607BC238899C@eris.apache.org> Author: kevan Date: Wed Aug 11 11:26:03 2010 New Revision: 984373 URL: http://svn.apache.org/viewvc?rev=984373&view=rev Log: GERONIMO-5152 fix some java 5 compile issues Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java?rev=984373&r1=984372&r2=984373&view=diff ============================================================================== --- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java (original) +++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java Wed Aug 11 11:26:03 2010 @@ -58,7 +58,6 @@ public class CommitTask implements Runna this.txLog = txLog; } - @Override public void run() { synchronized (this) { status = Status.STATUS_COMMITTING; Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=984373&r1=984372&r2=984373&view=diff ============================================================================== --- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original) +++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Wed Aug 11 11:26:03 2010 @@ -711,7 +711,7 @@ public class TransactionImpl implements || e.errorCode == XAException.XAER_NOTA) { // Per XA spec, XAException.XAER_RMERR from commit means An error occurred in // committing the work performed on behalf of the transaction branch - // and the branchÕs work has been rolled back. + // and the branches work has been rolled back. // XAException.XAER_NOTA: ssume the DB took a unilateral rollback decision and forgot the transaction log.info("Transaction has been rolled back"); cause = e;