modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java
| 6 ++++--
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java
| 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit de211f8fc7cbee6258b7dde44a602e9734036b23
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Apr 28 16:09:48 2010 -0400
[BZ 544353] Modifying ui backing bean for edit page so stale values are not used
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java
index 09837ec..262c173 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java
@@ -103,6 +103,8 @@ public class EditGroupDefinitionGeneralPropertiesUIBean {
}
public String update() {
+ HttpSession session = FacesContextUtility.getRequest().getSession();
+
try {
GroupDefinition groupDefinition =
GroupDefinitionUIBean.lookupGroupDefinition();
@@ -120,8 +122,6 @@ public class EditGroupDefinitionGeneralPropertiesUIBean {
groupDefinition.setExpression(expression.replaceAll("\\r",
"\n").replaceAll("\\f", "\n").replaceAll("\\n+",
"\n"));
- HttpSession session = FacesContextUtility.getRequest().getSession();
-
session.setAttribute(TEMPORARY_EDIT_MARKER, "marker");
session.setAttribute(TEMPORARY_EXPRESSION_ATTRIBUTE, expression);
session.setAttribute(TEMPORARY_NAME_ATTRIBUTE, name);
@@ -148,6 +148,8 @@ public class EditGroupDefinitionGeneralPropertiesUIBean {
return OUTCOME_FAILURE;
}
+ session.removeAttribute(TEMPORARY_EDIT_MARKER);
+
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "General
properties updated.");
return OUTCOME_SUCCESS;
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java
index ef3c90d..587ed1b 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java
@@ -99,7 +99,7 @@ public class NewGroupDefinitionGeneralPropertiesUIBean {
return OUTCOME_FAILURE;
}
- session.setAttribute(TEMPORARY_CREATE_MARKER, null);
+ session.removeAttribute(TEMPORARY_CREATE_MARKER);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO,
"Definition created successfully. Add conditions below.");