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/30 00:13:59 UTC
svn commit: r1097972 - in /geronimo/components/txmanager/trunk: ./
geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/
geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Author: dblevins
Date: Fri Apr 29 22:13:58 2011
New Revision: 1097972
URL: http://svn.apache.org/viewvc?rev=1097972&view=rev
Log:
svn merge -r 1097964:1097965 https://svn.apache.org/repos/asf/geronimo/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
------------------------------------------------------------------------
Modified:
geronimo/components/txmanager/trunk/ (props changed)
geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ (props changed)
geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Propchange: geronimo/components/txmanager/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 22:13:58 2011
@@ -1,4 +1,4 @@
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1:780438-803185,984259,984262,984273
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1:981270
-/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2:1023970,1097555
+/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2:1023970,1097555,1097965
/geronimo/sandbox/djencks/txmanager:1058803,1073479
Propchange: geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 22:13:58 2011
@@ -1,4 +1,4 @@
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:780438-803185,984259,984262,984273
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:981270
-/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:1023970,1097555
+/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:1023970,1097555,1097965
/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:1058785,1058792,1058803,1073479
Modified: geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=1097972&r1=1097971&r2=1097972&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Fri Apr 29 22:13:58 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;
}