Get the timeout for Container Managed Transaction (CMT) from Transact…

…ionService
eclipse-ee4j · Mar 3, 2023 · 75c208b · 75c208b
1 parent b539202
commit 75c208b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...jb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java b/...jb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java
@@ -22,6 +22,7 @@
 import com.sun.enterprise.deployment.MethodDescriptor;
 import com.sun.enterprise.transaction.api.JavaEETransaction;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
+import com.sun.enterprise.transaction.config.TransactionService;
 import com.sun.enterprise.util.LocalStringManagerImpl;
 
 import jakarta.ejb.EJBException;
@@ -39,6 +40,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.ejb.deployment.descriptor.ContainerTransaction;
 import org.glassfish.ejb.deployment.descriptor.EjbApplicationExceptionInfo;
 import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
@@ -75,6 +77,14 @@ public class EJBContainerTransactionManager {
         ejbDescriptor = ejbDesc;
         transactionManager = ejbContainerUtilImpl.getTransactionManager();
 
+        // get transactionTimeout from TransactionService
+        TransactionService txnService = ejbContainerUtilImpl.getServices().getService(TransactionService.class,
+                ServerEnvironment.DEFAULT_INSTANCE_NAME);
+        int transactionTimeout = Integer.parseInt(txnService.getTimeoutInSeconds());
+        if (transactionTimeout != 0) {
+            cmtTimeoutInSeconds = transactionTimeout;
+        }
+
         IASEjbExtraDescriptors iased = ejbDesc.getIASEjbExtraDescriptors();
 
         if(iased.getCmtTimeoutInSeconds() != 0){