Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 12:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

suppress duplicate attributes in the influence chain

Browse Source
This commit is contained in:
Jesse McConnell 2012-08-14 10:09:13 -05:00
parent ad123c4032
commit 447b9ecee5
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
View File

@ -78,6 +78,12 @@ public class ObjectMBean implements DynamicMBean
private Map<String, Method> _getters=new HashMap<String, Method>();
private Map<String, Method> _setters=new HashMap<String, Method>();
private Map<String, Method> _methods=new HashMap<String, Method>();
// set of attributes mined from influence hierarchy
private Set<String> _attributes = new HashSet<String>();
// set of attributes that are automatically converted to ObjectName
// as they represent other managed beans which can be linked to
private Set<String> _convert=new HashSet<String>();
private ClassLoader _loader;
private MBeanContainer _mbeanContainer;
@ -271,7 +277,11 @@ public class ObjectMBean implements DynamicMBean
{
// TODO sort out how a proper name could get here, its a method name as an attribute at this point.
LOG.debug("Attribute Annotation found for: " + method.getName());
attributes.add(defineAttribute(method,methodAttributeAnnotation));
MBeanAttributeInfo mai = defineAttribute(method,methodAttributeAnnotation);
if ( mai != null )
{
attributes.add(mai);
}
}
ManagedOperation methodOperationAnnotation = method.getAnnotation(ManagedOperation.class);
@ -575,6 +585,11 @@ public class ObjectMBean implements DynamicMBean
name = toVariableName(method.getName());
}
if ( _attributes.contains(name))
{
return null; // we have an attribute named this already
}
String description = attributeAnnotation.value();
boolean readonly = attributeAnnotation.readonly();
boolean onMBean = attributeAnnotation.proxied();
@ -697,6 +712,8 @@ public class ObjectMBean implements DynamicMBean
info= new MBeanAttributeInfo(name,description,method,setter);
}
_attributes.add(name);
return info;
}
catch (Exception e)