You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/20 04:49:48 UTC
svn commit: r639148 -
/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
Author: dblevins
Date: Wed Mar 19 20:49:46 2008
New Revision: 639148
URL: http://svn.apache.org/viewvc?rev=639148&view=rev
Log:
Merging r638225 - http://svn.apache.org/viewvc?rev=638225&view=rev
svn merge -r 638224:638225 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r638225 | djencks | 2008-03-17 23:06:11 -0700 (Mon, 17 Mar 2008) | 1 line
OPENEJB-782 GERONIMO-3907 don't swallow RollbackException
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?rev=639148&r1=639147&r2=639148&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java Wed Mar 19 20:49:46 2008
@@ -31,6 +31,8 @@
import javax.transaction.HeuristicRollbackException;
import javax.transaction.RollbackException;
import javax.transaction.NotSupportedException;
+import javax.ejb.EJBException;
+
import java.rmi.RemoteException;
public abstract class TransactionPolicy {
@@ -145,15 +147,18 @@
} catch (RollbackException e) {
txLogger.info("The transaction has been rolled back rather than commited: " + e.getMessage());
+ throw new EJBException(e);
} catch (HeuristicMixedException e) {
txLogger.info("A heuristic decision was made, some relevant updates have been committed while others have been rolled back: " + e.getMessage());
+ throw new EJBException(e);
} catch (HeuristicRollbackException e) {
txLogger.info("A heuristic decision was made while commiting the transaction, some relevant updates have been rolled back: " + e.getMessage());
-
+ throw new EJBException(e);
+
} catch (SecurityException e) {
txLogger.error("The current thread is not allowed to commit the transaction: " + e.getMessage());