Skip to content
Permalink
Browse files
svn merge -r 1097964:1097965 https://svn.apache.org/repos/asf/geronim…
…o/components/txmanager/branches/geronimo-txmanager-parent-2.2

http://svn.apache.org/viewvc?view=revision&revision=1097965
------------------------------------------------------------------------
r1097965 | dblevins | 2011-04-29 14:50:19 -0700 (Fri, 29 Apr 2011) | 2 lines

Switch Exception to Throwable

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@1097972 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dblevins committed Apr 29, 2011
1 parent a4ab92f commit 3df0b6e9314a1dc3c3f9e0675080680fd350de7a
Showing 1 changed file with 3 additions and 3 deletions.
@@ -57,7 +57,7 @@ public class TransactionImpl implements Transaction {
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 synchronized void setRollbackOnly() throws IllegalStateException {
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 @@ private void beforeCompletion(List syncs) {
}
}

private void markRollbackCause(Exception e) {
private void markRollbackCause(Throwable e) {
if (markRollbackCause == null) {
markRollbackCause = e;
}

0 comments on commit 3df0b6e

Please sign in to comment.