geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: rev 54719 - in geronimo/trunk: . modules/transaction/src/java/org/apache/geronimo/transaction/context
Date Wed, 13 Oct 2004 01:28:04 GMT
Author: dain
Date: Tue Oct 12 18:28:03 2004
New Revision: 54719

Modified:
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/ContainerTransactionContext.java
   geronimo/trunk/project.properties
Log:
Added openejb itests back into main build since they now work again
Added RollbackException back into ContainerTransactionContext since commit can throw one


Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/ContainerTransactionContext.java
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/ContainerTransactionContext.java
(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/ContainerTransactionContext.java
Tue Oct 12 18:28:03 2004
@@ -25,6 +25,7 @@
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
+import javax.transaction.RollbackException;
 
 /**
  * @version $Rev$ $Date$
@@ -58,7 +59,7 @@
         threadAssociated = true;
     }
 
-    public void commit() throws HeuristicMixedException, HeuristicRollbackException, SystemException
{
+    public void commit() throws HeuristicMixedException, HeuristicRollbackException, SystemException,
RollbackException {
         boolean wasCommitted = false;
         try {
             if (checkRolledback()) {
@@ -115,7 +116,7 @@
         return false;
     }
 
-    private void rollbackAndThrow(String message, Throwable throwable) throws HeuristicMixedException,
HeuristicRollbackException, SystemException {
+    private void rollbackAndThrow(String message, Throwable throwable) throws HeuristicMixedException,
HeuristicRollbackException, SystemException, RollbackException {
         try {
             // just incase there is a junk transaction on the thread
             if (txnManager.getStatus() != Status.STATUS_NO_TRANSACTION) {
@@ -129,6 +130,8 @@
             throw (HeuristicMixedException) throwable;
         } else if (throwable instanceof HeuristicRollbackException) {
             throw (HeuristicRollbackException) throwable;
+        } else if (throwable instanceof RollbackException) {
+            throw (RollbackException) throwable;
         } else if (throwable instanceof SystemException) {
             throw (SystemException) throwable;
         } else if (throwable instanceof Error) {

Modified: geronimo/trunk/project.properties
==============================================================================
--- geronimo/trunk/project.properties	(original)
+++ geronimo/trunk/project.properties	Tue Oct 12 18:28:03 2004
@@ -53,7 +53,6 @@
 maven.multiproject.excludes=\
 modules/tomcat/project.xml,\
 itests/*/project.xml,\
-openejb/modules/itests/project.xml,\
 openejb/modules/connector/project.xml,\
 openejb/modules/webadmin/project.xml
 

Mime
View raw message