Merge pull request #24702 from zistrong/7.0.11-bugfix

fix cmtTimeoutInSeconds config, it can't take effect when set value 0 in admin UI.
eclipse-ee4j · Dec 10, 2023 · b2ba6ea · b2ba6ea
2 parents ae9c8aa + e32edab
commit b2ba6ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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
@@ -81,7 +81,7 @@ public class EJBContainerTransactionManager {
         TransactionService txnService = ejbContainerUtilImpl.getServices().getService(TransactionService.class,
                 ServerEnvironment.DEFAULT_INSTANCE_NAME);
         int transactionTimeout = Integer.parseInt(txnService.getTimeoutInSeconds());
-        if (transactionTimeout != 0) {
+        if (transactionTimeout >= 0) {
             cmtTimeoutInSeconds = transactionTimeout;
         }
 

diff --git a/.../internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java b/.../internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java
@@ -75,7 +75,7 @@ public interface TransactionService extends ConfigBeanProxy, PropertyBag, Config
      * @return possible object is
      *         {@link String }
      */
-    @Attribute (defaultValue="0",dataType=Integer.class)
+    @Attribute (defaultValue="120",dataType=Integer.class)
     public String getTimeoutInSeconds();
 
     /**