tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r644611 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
Date Fri, 04 Apr 2008 05:15:16 GMT
Author: dblevins
Date: Thu Apr  3 22:15:15 2008
New Revision: 644611

URL: http://svn.apache.org/viewvc?rev=644611&view=rev
Log:
Throw the EJB 1.1 view of the exception, conversion code will switch it to the correct view
(i.e. the conversion code only goes the one way)

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?rev=644611&r1=644610&r2=644611&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
Thu Apr  3 22:15:15 2008
@@ -24,13 +24,7 @@
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.NotSupportedException;
+import javax.transaction.*;
 import javax.ejb.EJBException;
 import javax.ejb.EJBTransactionRolledbackException;
 
@@ -148,18 +142,18 @@
         } catch (RollbackException e) {
 
             txLogger.info("The transaction has been rolled back rather than commited: " +
e.getMessage());
-            Exception txe = new EJBTransactionRolledbackException("Transaction was rolled
back, presumably because setRollbackOnly was called during a synchronization", e);
+            Throwable txe = new javax.transaction.TransactionRolledbackException("Transaction
was rolled back, presumably because setRollbackOnly was called during a synchronization").initCause(e);
             throw new ApplicationException(txe);
 
         } 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 ApplicationException(new EJBException(e));
+            throw new ApplicationException(new RemoteException("A heuristic decision was
made, some relevant updates have been committed while others have been rolled back").initCause(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 ApplicationException(new EJBException(e));
+            throw new ApplicationException(new RemoteException("A heuristic decision was
made while commiting the transaction, some relevant updates have been rolled back").initCause(e));
  
         } catch (SecurityException e) {
 



Mime
View raw message