Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE37523F1 for ; Fri, 29 Apr 2011 21:50:40 +0000 (UTC) Received: (qmail 42966 invoked by uid 500); 29 Apr 2011 21:50:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 42925 invoked by uid 500); 29 Apr 2011 21:50:40 -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 42918 invoked by uid 99); 29 Apr 2011 21:50:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2011 21:50:40 +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; Fri, 29 Apr 2011 21:50:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7138D2388A2C; Fri, 29 Apr 2011 21:50:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1097965 - /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Date: Fri, 29 Apr 2011 21:50:19 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110429215019.7138D2388A2C@eris.apache.org> Author: dblevins Date: Fri Apr 29 21:50:19 2011 New Revision: 1097965 URL: http://svn.apache.org/viewvc?rev=1097965&view=rev Log: Switch Exception to Throwable Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/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.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=1097965&r1=1097964&r2=1097965&view=diff ============================================================================== --- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original) +++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Fri Apr 29 21:50:19 2011 @@ -57,7 +57,7 @@ public class TransactionImpl implements private final IdentityHashMap activeXaResources = new IdentityHashMap(3); private final IdentityHashMap suspendedXaResources = new IdentityHashMap(3); private int status = Status.STATUS_NO_TRANSACTION; - private Exception markRollbackCause; + private Throwable markRollbackCause; private Object logMark; private final Map resources = new HashMap(); @@ -126,7 +126,7 @@ public class TransactionImpl implements setRollbackOnly(new SetRollbackOnlyException()); } - public synchronized void setRollbackOnly(Exception reason) { + public synchronized void setRollbackOnly(Throwable reason) { switch (status) { case Status.STATUS_ACTIVE: case Status.STATUS_PREPARING: @@ -535,7 +535,7 @@ public class TransactionImpl implements } } - private void markRollbackCause(Exception e) { + private void markRollbackCause(Throwable e) { if (markRollbackCause == null) { markRollbackCause = e; }