RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix memory leak in TemplateController

Browse source 
FEA: ItEr74S08DeployFramework
This commit is contained in:
Óscar González Fernández 2011-05-23 18:32:19 +02:00
parent 434c92d5be
commit 783a87e5ba
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java
View file

@ -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

10
navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java
View file

@ -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