From f62a945c45177afde9fb1312dbd730fd09c14979 Mon Sep 17 00:00:00 2001 From: dsplayerX Date: Fri, 21 Jun 2024 12:14:56 +0530 Subject: [PATCH] Address review suggestions --- .../TransactionResourceManager.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index ad5f391b9577..ef8a06d2d54a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -198,11 +198,15 @@ private String getTransactionLogDirectory() { public static int getTransactionAutoCommitTimeout() { VariableKey transactionAutoCommitTimeoutKey = new VariableKey(TRANSACTION_PACKAGE_ID, TRANSACTION_AUTO_COMMIT_TIMEOUT_KEY, PredefinedTypes.TYPE_INT, false); - Object value = ConfigMap.get(transactionAutoCommitTimeoutKey); - if (value == null) { + if (!ConfigMap.containsKey(transactionAutoCommitTimeoutKey)) { return DEFAULT_TRX_AUTO_COMMIT_TIMEOUT; + } else { + Object configValue = ConfigMap.get(transactionAutoCommitTimeoutKey); + if (configValue == null) { + return DEFAULT_TRX_AUTO_COMMIT_TIMEOUT; + } + return parseTimeoutValue(configValue, DEFAULT_TRX_AUTO_COMMIT_TIMEOUT); } - return parseTimeoutValue(value, DEFAULT_TRX_AUTO_COMMIT_TIMEOUT); } /** @@ -214,15 +218,19 @@ public static int getTransactionCleanupTimeout() { VariableKey transactionCleanupTimeoutKey = new VariableKey(TRANSACTION_PACKAGE_ID, TRANSACTION_CLEANUP_TIMEOUT_KEY, PredefinedTypes.TYPE_INT, false); - Object value = ConfigMap.get(transactionCleanupTimeoutKey); - if (value == null) { - return DEFAULT_TRX_CLEANUP_TIMEOUT; + if (!ConfigMap.containsKey(transactionCleanupTimeoutKey)) { + return DEFAULT_TRX_AUTO_COMMIT_TIMEOUT; + } else { + Object configValue = ConfigMap.get(transactionCleanupTimeoutKey); + if (configValue == null) { + return DEFAULT_TRX_CLEANUP_TIMEOUT; + } + return parseTimeoutValue(configValue, DEFAULT_TRX_CLEANUP_TIMEOUT); } - return parseTimeoutValue(value, DEFAULT_TRX_CLEANUP_TIMEOUT); } - private static int parseTimeoutValue(Object value, int defaultValue) { - if (!(value instanceof Number number)) { + private static int parseTimeoutValue(Object configValue, int defaultValue) { + if (!(configValue instanceof Number number)) { return defaultValue; } int timeoutValue = number.intValue();