From db06347370bb7cec543873d291b7647fae2da2e3 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 17 Dec 2010 12:15:51 +0100
Subject: [PATCH] Fixed tests failing in ResourceServiceTest.

FEA: ItEr65S06BugFixing
---
 .../business/common/daos/ConfigurationDAO.java             | 7 ++++++-
 .../business/common/daos/IConfigurationDAO.java            | 5 +++++
 .../org/navalplanner/web/common/CustomMenuController.java  | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/ConfigurationDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/ConfigurationDAO.java
index 96374580f..aed3e96db 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/ConfigurationDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/ConfigurationDAO.java
@@ -39,7 +39,6 @@ public class ConfigurationDAO extends GenericDAOHibernate<Configuration, Long>
         implements IConfigurationDAO {
 
     @Override
-    @Transactional(readOnly = true)
     public Configuration getConfiguration() {
         List<Configuration> list = list(Configuration.class);
         if (list.isEmpty()) {
@@ -48,4 +47,10 @@ public class ConfigurationDAO extends GenericDAOHibernate<Configuration, Long>
         return list.get(0);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public Configuration getConfigurationWithReadOnlyTransaction() {
+        return getConfiguration();
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/IConfigurationDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/IConfigurationDAO.java
index 8b7216610..c4a509fdb 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/IConfigurationDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/IConfigurationDAO.java
@@ -34,4 +34,9 @@ public interface IConfigurationDAO extends IGenericDAO<Configuration, Long> {
      */
     Configuration getConfiguration();
 
+    /**
+     * @return The application configuration open a read-only transaction.
+     */
+    Configuration getConfigurationWithReadOnlyTransaction();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 40143ebc4..60019de17 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -469,7 +469,8 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
     }
 
     public boolean isScenariosVisible() {
-        return Registry.getConfigurationDAO().getConfiguration()
+        return Registry.getConfigurationDAO()
+                .getConfigurationWithReadOnlyTransaction()
                 .isScenariosVisible();
     }