FINERACT-2081: Consider read-only all the transactions when the conne…

…ction is read-only
apache · Dec 12, 2024 · 2e43229 · 2e43229
1 parent d57906d
commit 2e43229
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...e/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java b/...e/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java
@@ -70,10 +70,8 @@ public DataSource retrieveDataSource() {
             Long tenantConnectionKey = tenantConnection.getConnectionId();
             // if tenantConnection information available switch to the
             // appropriate datasource for that tenant.
-            actualDataSource = TENANT_TO_DATA_SOURCE_MAP.computeIfAbsent(tenantConnectionKey, (key) -> {
-                DataSource tenantSpecificDataSource = dataSourcePerTenantServiceFactory.createNewDataSourceFor(tenantConnection);
-                return tenantSpecificDataSource;
-            });
+            actualDataSource = TENANT_TO_DATA_SOURCE_MAP.computeIfAbsent(tenantConnectionKey,
+                    (key) -> dataSourcePerTenantServiceFactory.createNewDataSourceFor(tenantConnection));
 
         }
 

diff --git a/...va/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java b/...va/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java
@@ -20,6 +20,8 @@
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.FlushModeType;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
@@ -41,7 +43,7 @@ public ExtendedJpaTransactionManager() {
     @Override
     protected void doBegin(Object transaction, TransactionDefinition definition) {
         super.doBegin(transaction, definition);
-        if (isReadOnlyTx(transaction)) {
+        if (isReadOnlyConnection() || isReadOnlyTx(transaction)) {
             EntityManager entityManager = getCurrentEntityManager();
             if (entityManager != null) {
                 entityManager.setFlushMode(FlushModeType.COMMIT);
@@ -52,7 +54,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 
     @Override
     protected void doCommit(DefaultTransactionStatus status) {
-        if (isReadOnlyTx(status.getTransaction())) {
+        if (isReadOnlyConnection() || isReadOnlyTx(status.getTransaction())) {
             EntityManager entityManager = getCurrentEntityManager();
             if (entityManager != null) {
                 entityManager.clear();
@@ -62,6 +64,14 @@ protected void doCommit(DefaultTransactionStatus status) {
         invokeLifecycleCallbacks(TransactionLifecycleCallback::afterCommit);
     }
 
+    private boolean isReadOnlyConnection() {
+        try (Connection connection = getDataSource().getConnection()) {
+            return connection.isReadOnly();
+        } catch (SQLException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     @Override
     protected void doCleanupAfterCompletion(Object transaction) {
         super.doCleanupAfterCompletion(transaction);