You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2011/04/29 23:50:19 UTC
svn commit: r1097965 -
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
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<XAResource, TransactionBranch> activeXaResources = new IdentityHashMap<XAResource, TransactionBranch>(3);
private final IdentityHashMap<XAResource, TransactionBranch> suspendedXaResources = new IdentityHashMap<XAResource, TransactionBranch>(3);
private int status = Status.STATUS_NO_TRANSACTION;
- private Exception markRollbackCause;
+ private Throwable markRollbackCause;
private Object logMark;
private final Map<Object, Object> resources = new HashMap<Object, Object>();
@@ -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;
}