modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
| 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
| 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a2d2fdb1da532a2b81619e5e645d066f5948360f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 10:03:43 2012 -0400
use constants
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
index a6fbc5b..27d4dfc 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
@@ -14,6 +14,7 @@ import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.domain.common.ServerDetails;
+import org.rhq.core.domain.common.composite.SystemSetting;
import org.rhq.core.domain.common.composite.SystemSettings;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
@@ -63,7 +64,8 @@ public class SystemInfoManagerBean implements SystemInfoManagerLocal{
// Don't use putAll(), as we need to filter out passwords
for (Map.Entry<String,String> detail : settingsMap.entrySet()) {
String key = detail.getKey();
- if (key.equals("CAM_LDAP_BIND_PW") ||
key.equals("CAM_HELP_PASSWORD")) {
+ if (key.equals(SystemSetting.LDAP_BIND_PW.getInternalName())
+ || key.equals(SystemSetting.HELP_PASSWORD.getInternalName())) {
if (detail.getValue()==null)
result.put(key,"- null -");
else
commit d056113808b211faaeafe2b55c7c38ba6c041309
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 10:03:36 2012 -0400
fix agent update servlet
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
index c4601ec..8069096 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
@@ -188,7 +188,7 @@ public class AgentUpdateServlet extends HttpServlet {
// if the server cloud was configured to disallow updates, return 0
SystemSettings systemConfig = LookupUtil.getSystemManager().getSystemSettings(
LookupUtil.getSubjectManager().getOverlord());
- if
(!Boolean.parseBoolean(systemConfig.get(SystemSetting.AGENT_AUTO_UPDATE_ENABLED.getInternalName())))
{
+ if
(!Boolean.parseBoolean(systemConfig.get(SystemSetting.AGENT_AUTO_UPDATE_ENABLED))) {
return 0;
}
Show replies by date