remove managed=true need for ManagedOperation

2012-08-13 16:50:15 -05:00 · 2012-08-13 16:50:15 -05:00 · 74f8822e64
parent 11dbce81c8
commit 74f8822e64
1 changed files with 16 additions and 1 deletions
--- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
+++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
@ -726,7 +726,22 @@ public class ObjectMBean implements DynamicMBean
    {
        String description = methodAnnotation.value();
        boolean onMBean = methodAnnotation.proxied();
-        boolean convert = methodAnnotation.managed();
+        
+        boolean convert = false;
+        
+        // determine if we should convert
+        Class<?> returnType = method.getReturnType();
+        
+        if ( returnType.isArray() )
+        {
+            returnType = returnType.getComponentType();
+        }
+        
+        if ( returnType.isAnnotationPresent(ManagedObject.class))
+        {
+            convert = true;
+        }
+        
        String impactName = methodAnnotation.impact();