svn commit: r1795900 - /aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java

[cschneider]

Author: cschneider
Date: Tue May 23 12:14:03 2017
New Revision: 1795900

URL: http://svn.apache.org/viewvc?rev=1795900&view=rev
Log:
ARIES-1690: Add Transactional dontRollbackOn/rollbackOn evaluation. Closes #72

Modified:
    
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java

Modified: 
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java?rev=1795900&r1=1795899&r2=1795900&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
 (original)
+++ 
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
 Tue May 23 12:14:03 2017
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
 import javax.transaction.RollbackException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
+import javax.transaction.Transactional;
 import javax.transaction.Transactional.TxType;
 
 import org.apache.aries.blueprint.Interceptor;
@@ -77,7 +78,7 @@ public class TxInterceptorImpl implement
         safeEndCoordination(token);
         try {
             Transaction tran = token.getActiveTransaction();
-            if (tran != null && isRollBackException(ex)) {
+            if (tran != null && isRollBackException(ex, m)) {
                 tran.setRollbackOnly();
                 LOGGER.debug("Setting transaction to rollback only because of 
exception ", ex);
             }
@@ -126,7 +127,39 @@ public class TxInterceptorImpl implement
         return cm == null ? null : cm.getId();
     }
 
-    private static boolean isRollBackException(Throwable ex) {
+    private boolean isRollBackException(Throwable ex, Method m) {
+        if (m != null) {
+            Transactional annotation = m.getAnnotation(Transactional.class);
+            if (annotation == null) {
+                return isUncheckedException(ex);
+            } else {
+                //check dontRollbackOn first, since according to spec it has 
precedence
+                Class[] dontRollbackOn = annotation.dontRollbackOn();
+                for (Class dontRollbackClass : dontRollbackOn) {
+                    if (dontRollbackClass.isInstance(ex)) {
+                        LOGGER.debug("Current exception {} found in element 
dontRollbackOn.", ex.getClass());
+                        return false;
+                    }
+                }
+                //don't need to check further elements if ex is an unchecked 
exception
+                if (isUncheckedException(ex)) {
+                    return true;
+                }
+                Class[] rollbackOn = annotation.rollbackOn();
+                for (Class rollbackExceptionClass : rollbackOn) {
+                    if (rollbackExceptionClass.isInstance(ex)) {
+                        LOGGER.debug("Current exception {} found in element 
rollbackOn.", ex.getClass());
+                        return true;
+                    }
+                }
+            }
+        } else {
+               return isUncheckedException(ex);
+        }
+        return false;
+    }
+
+    private static boolean isUncheckedException(Throwable ex) {
         return ex instanceof RuntimeException || ex instanceof Error;
     }