diff --git a/examples/embedded/src/main/resources/jetty-logging.properties b/examples/embedded/src/main/resources/jetty-logging.properties index 08b834611b3..c0a226179d4 100644 --- a/examples/embedded/src/main/resources/jetty-logging.properties +++ b/examples/embedded/src/main/resources/jetty-logging.properties @@ -9,4 +9,4 @@ #org.eclipse.jetty.server.LEVEL=DEBUG #org.eclipse.jetty.servlets.LEVEL=DEBUG #org.eclipse.jetty.alpn.LEVEL=DEBUG -org.eclipse.jetty.jmx.LEVEL=DEBUG +#org.eclipse.jetty.jmx.LEVEL=DEBUG diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java index 1a49a9ee80e..17ef201b4e7 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java @@ -159,12 +159,11 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De LOG.debug("MBean for {} is {}", o, mbean); if (mbean instanceof ObjectMBean) { - MBeanInfo info =((ObjectMBean)mbean).getMBeanInfo(); - for (Object a :info.getAttributes()) - LOG.debug(" {}", a); - for (Object a :info.getOperations()) - LOG.debug(" {}", a); - + MBeanInfo info = ((ObjectMBean)mbean).getMBeanInfo(); + for (Object a : info.getAttributes()) + LOG.debug(" {}", a); + for (Object a : info.getOperations()) + LOG.debug(" {}", a); } } return mbean; diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java index 11b0fda18e1..c290c727770 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java @@ -154,18 +154,26 @@ class MetaData private OperationInfo findOperation(String signature) { - OperationInfo result = _operations.get(signature); - if (result != null) - return result; + OperationInfo result = null; for (MetaData intf : _interfaces) { - result = intf.findOperation(signature); - if (result != null) - return result; + OperationInfo r = intf.findOperation(signature); + if (r != null) + result = r; } + if (_parent != null) - return _parent.findOperation(signature); - return null; + { + OperationInfo r = _parent.findOperation(signature); + if (r != null) + result = r; + } + + OperationInfo r = _operations.get(signature); + if (r != null) + result = r; + + return result; } private static Object newInstance(Constructor constructor, Object bean) @@ -385,7 +393,7 @@ class MetaData void setAttribute(Object value, ObjectMBean mbean) throws ReflectionException, MBeanException { if (LOG.isDebugEnabled()) - LOG.debug("setAttribute {}.{}={} {}",mbean,_info.getName(), value, _info); + LOG.debug("setAttribute {}.{}={} {}", mbean, _info.getName(), value, _info); try { if (_setter == null) @@ -496,7 +504,7 @@ class MetaData public Object invoke(Object[] args, ObjectMBean mbean) throws ReflectionException, MBeanException { if (LOG.isDebugEnabled()) - LOG.debug("invoke {}.{}({}) {}",mbean,_info.getName(), Arrays.asList(args), _info); + LOG.debug("invoke {}.{}({}) {}", mbean, _info.getName(), Arrays.asList(args), _info); try { Object target = mbean.getManagedObject(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index 80d61b8dd09..ec7b51c62b4 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -226,7 +226,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co } @Override - @ManagedAttribute + @ManagedAttribute("The connection idle timeout in milliseconds") public long getIdleTimeout() { return _idleTimeout;