modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
| 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit fc4ac3fb4e0e754fb634e105fc396d5e9b80d934
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 1 15:40:27 2011 -0400
[BZ 750224] NPE check
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index f2a1fa6..5b88fe5 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -136,7 +136,7 @@ import org.rhq.enterprise.server.util.QuartzUtil;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings({"UnnecessaryLocalVariable",
"UnnecessaryReturnStatement"})
+@SuppressWarnings({ "UnnecessaryLocalVariable",
"UnnecessaryReturnStatement" })
@Stateless
@XmlType(namespace = ServerVersion.namespace)
public class ConfigurationManagerBean implements ConfigurationManagerLocal,
ConfigurationManagerRemote {
@@ -1245,6 +1245,9 @@ public class ConfigurationManagerBean implements
ConfigurationManagerLocal, Conf
private boolean isRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef =
resource.getResourceType().getResourceConfigurationDefinition();
+ if (configDef == null) {
+ return false;
+ }
return (ConfigurationFormat.STRUCTURED_AND_RAW ==
configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
.getConfigurationFormat()));
@@ -1253,7 +1256,9 @@ public class ConfigurationManagerBean implements
ConfigurationManagerLocal, Conf
private boolean isStructuredAndRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef =
resource.getResourceType().getResourceConfigurationDefinition();
-
+ if (configDef == null) {
+ return false;
+ }
return ConfigurationFormat.STRUCTURED_AND_RAW ==
configDef.getConfigurationFormat();
}
Show replies by date