Backporting to 4.1.2 - GLASSFISH-21172 javax.transaction.RollbackException from @transactional bean has no cause set

svn path=/branches/4.1.2/; revision=64504


Former-commit-id: 73e64a9d75566d399cd29a6c93089b77e9a89686

Author: srinivaskrishnan

appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -225,6 +225,7 @@ public Object proceed(InvocationContext ctx) throws Exception {
         try {
             object = ctx.proceed();
         } catch (RuntimeException runtimeException) {
+            _logger.log(java.util.logging.Level.INFO, "Error during transaction processing", runtimeException);
             Class dontRollbackOnClass =
                     getClassInArrayClosestToClassOrNull(dontRollbackOn, runtimeException.getClass());
             if (dontRollbackOnClass == null) { //proceed as default...
@@ -253,6 +254,7 @@ else if(dontRollbackOnClass.isAssignableFrom(rollbackOnClass)) {
             markRollbackIfActiveTransaction();
             throw runtimeException;
         } catch (Exception checkedException) {
+            _logger.log(java.util.logging.Level.INFO, "Error during transaction processing", checkedException);
             Class rollbackOnClass =
                     getClassInArrayClosestToClassOrNull(rollbackOn, checkedException.getClass());
             if (rollbackOnClass == null) { //proceed as default...

appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -45,6 +45,7 @@
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
+import javax.transaction.Status;
 import javax.transaction.TransactionalException;
 import java.util.logging.Logger;
 
@@ -92,18 +93,24 @@ public Object transactional(InvocationContext ctx) throws Exception {
             try {
                 proceed = proceed(ctx);
             } finally {
-                if (isTransactionStarted)
+                if (isTransactionStarted) {
                     try {
-                        getTransactionManager().commit();
+                        // Exception handling for proceed method call above can set TM/TRX as setRollbackOnly
+                        if(getTransactionManager().getTransaction().getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+                            getTransactionManager().rollback();
+                        } else {
+                            getTransactionManager().commit();
+                        }
                     } catch (Exception exception) {
                         String messageString =
                                 "Managed bean with Transactional annotation and TxType of REQUIRED " +
                                         "encountered exception during commit " +
                                         exception;
                         _logger.log(java.util.logging.Level.INFO,
-                            CDI_JTA_MBREQUIREDCT, exception);
+                                CDI_JTA_MBREQUIREDCT, exception);
                         throw new TransactionalException(messageString, exception);
                     }
+                }
             }
             return proceed;
         } finally {

appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -45,6 +45,7 @@
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
+import javax.transaction.Status;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionalException;
 import java.util.logging.Logger;
@@ -96,7 +97,12 @@ public Object transactional(InvocationContext ctx) throws Exception {
                 proceed = proceed(ctx);
             } finally {
                 try {
-                    getTransactionManager().commit();
+                    // Exception handling for proceed method call above can set TM/TRX as setRollbackOnly
+                    if(getTransactionManager().getTransaction().getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+                        getTransactionManager().rollback();
+                    } else {
+                        getTransactionManager().commit();
+                    }
                 } catch (Exception exception) {
                     String messageString =
                             "Managed bean with Transactional annotation and TxType of REQUIRES_NEW " +