From 783a87e5ba1903ff8aa28ab24f6b9ef361d0c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 23 May 2011 18:32:19 +0200
Subject: [PATCH] Fix memory leak in TemplateController

FEA: ItEr74S08DeployFramework
---
 .../navalplanner/web/common/TemplateController.java    |  7 -------
 .../java/org/navalplanner/web/users/UserModel.java     | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java
index 5de3d46c5..4f93dc6a2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java
@@ -64,16 +64,9 @@ public class TemplateController extends GenericForwardComposer {
 
     private IMessagesForUser windowMessages;
 
-    private static TemplateController current;
-
-    public static TemplateController getCurrent() {
-        return current;
-    }
-
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        TemplateController.current = this;
         if (templateModel.isScenariosVisible()) {
             window = (Window) comp.getFellow("changeScenarioWindow");
             windowMessages = new MessagesForUser(window
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
index bdd40cacd..29eb82d66 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
@@ -27,13 +27,13 @@ import java.util.List;
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.common.Configuration;
 import org.navalplanner.business.common.Registry;
+import org.navalplanner.business.common.daos.IConfigurationDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.daos.IUserDAO;
 import org.navalplanner.business.users.entities.Profile;
 import org.navalplanner.business.users.entities.User;
 import org.navalplanner.business.users.entities.UserRole;
-import org.navalplanner.web.common.TemplateController;
 import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
 import org.navalplanner.web.users.bootstrap.MandatoryUser;
 import org.navalplanner.web.users.services.IDBPasswordEncoderService;
@@ -57,6 +57,9 @@ public class UserModel implements IUserModel {
     @Autowired
     private IUserDAO userDAO;
 
+    @Autowired
+    private IConfigurationDAO configurationDAO;
+
     @Autowired
     private IDBPasswordEncoderService dbPasswordEncoderService;
 
@@ -179,8 +182,9 @@ public class UserModel implements IUserModel {
     }
 
     private String isWarningDefaultPasswdOthersVisible() {
-        return (TemplateController.getCurrent() != null) ? TemplateController
-                .getCurrent().getDefaultPasswdVisible() : "none";
+        return MandatoryUser
+                .adminChangedAndSomeOtherNotChanged(configurationDAO
+                        .getConfiguration()) ? "inline" : "none";
     }
 
     @Override