Bug 1654644 - Check instance type before casting to PropertyDefinitio…

…nSimple
rhq-project · Mar 7, 2019 · bbb17bc · bbb17bc
1 parent e88648a
commit bbb17bc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...les/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java b/...les/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
@@ -88,11 +88,12 @@ private static CtClass getSimpleTypeClass(ClassPool cp, PropertyDefinitionSimple
     }
 
     public static CtClass translateConfiguration(ClassPool cp, ConfigurationDefinition def) throws NotFoundException {
+        final String OPERATION_RESULT = "operationResult";
         if (def == null) {
             return CtClass.voidType;
-        } else if (def.getPropertyDefinitionSimple("operationResult") != null) {
+        } else if (def.get(OPERATION_RESULT) != null && def.get(OPERATION_RESULT) instanceof PropertyDefinitionSimple) {
             // Its a simple type
-            return getSimpleTypeClass(cp, def.getPropertyDefinitionSimple("operationResult"));
+            return getSimpleTypeClass(cp, def.getPropertyDefinitionSimple(OPERATION_RESULT));
         } else {
 
             // TODO GH: Build a custom type?