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/04/01 22:01:09 UTC

svn commit: r643547 - /openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java

Author: dblevins
Date: Tue Apr  1 13:01:04 2008
New Revision: 643547

URL: http://svn.apache.org/viewvc?rev=643547&view=rev
Log:
Merging r643213 - http://svn.apache.org/viewvc?rev=643213&view=rev

svn merge -r 643212:643213 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .

------------------------------------------------------------------------
r643213 | djencks | 2008-03-31 16:51:15 -0700 (Mon, 31 Mar 2008) | 1 line

OPENEJB-782 Further refinements on delivering the apropriate exception to the client on heuristic commit exceptions
------------------------------------------------------------------------

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=643547&r1=643546&r2=643547&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 Tue Apr  1 13:01:04 2008
@@ -154,12 +154,12 @@
         } 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);
+            throw new ApplicationException(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);
+            throw new ApplicationException(new EJBException(e));
  
         } catch (SecurityException e) {