Merge pull request #5767 from kabir/jmx-default-list-attribute

[WFCORE-6604] Avoid default value for arrays and TabularType
wildfly · Nov 15, 2023 · cc77d6b · cc77d6b
2 parents 9ba02e7 + 0903e92
commit cc77d6b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/jmx/src/main/java/org/jboss/as/jmx/model/MBeanInfoFactory.java b/jmx/src/main/java/org/jboss/as/jmx/model/MBeanInfoFactory.java
@@ -57,6 +57,7 @@
 import javax.management.openmbean.OpenMBeanParameterInfoSupport;
 import javax.management.openmbean.OpenType;
 import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularType;
 
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.CompositeOperationHandler;
@@ -263,9 +264,16 @@ private OpenMBeanParameterInfo[] getParameterInfos(OperationDefinition opDef, Mo
             boolean expressionsAllowed = value.hasDefined(EXPRESSIONS_ALLOWED) && value.get(EXPRESSIONS_ALLOWED).asBoolean();
             descriptions.put(DESC_EXPRESSIONS_ALLOWED, String.valueOf(expressionsAllowed));
 
+            OpenType<?> mbeanType = converters.convertToMBeanType(attributeDefinition, value);
             if (!expressionsAllowed) {
                 Object defaultValue = getIfExists(attributeDefinition, value, DEFAULT);
-                descriptions.put(DEFAULT_VALUE_FIELD, defaultValue);
+
+                // The OpenMBeanParameterInfoSupport constructor makes sure that arrays
+                // and TabularTypes do not have a default value. Avoid that exception
+                // by checking here and not adding a default value in this case.
+                if (!mbeanType.isArray() && !((Object)mbeanType instanceof TabularType) ) {
+                    descriptions.put(DEFAULT_VALUE_FIELD, defaultValue);
+                }
                 if (value.has(ALLOWED)) {
                     if (value.get(TYPE).asType()!=ModelType.LIST){
                         List<ModelNode> allowed = value.get(ALLOWED).asList();
@@ -287,12 +295,11 @@ private OpenMBeanParameterInfo[] getParameterInfos(OperationDefinition opDef, Mo
                 }
             }
 
-
             params.add(
                     new OpenMBeanParameterInfoSupport(
                             paramName,
                             getDescription(value),
-                            converters.convertToMBeanType(attributeDefinition, value),
+                            mbeanType,
                             new ImmutableDescriptor(descriptions)));
 
         }