This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 93ebb8777a4d46f6d237857d4c24c30424678f3a Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Sep 27 17:05:39 2019 +0100 Align with 8.5.x - spacing, javadoc, use JmxEnabled --- java/org/apache/catalina/mbeans/ContainerMBean.java | 2 +- java/org/apache/catalina/util/LifecycleMBeanBase.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/mbeans/ContainerMBean.java b/java/org/apache/catalina/mbeans/ContainerMBean.java index e4bb071..aa5adf3 100644 --- a/java/org/apache/catalina/mbeans/ContainerMBean.java +++ b/java/org/apache/catalina/mbeans/ContainerMBean.java @@ -28,6 +28,7 @@ import javax.management.modelmbean.InvalidTargetObjectTypeException; import org.apache.catalina.Container; import org.apache.catalina.ContainerListener; +import org.apache.catalina.JmxEnabled; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; import org.apache.catalina.Valve; @@ -37,7 +38,6 @@ import org.apache.catalina.core.StandardHost; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.HostConfig; import org.apache.catalina.util.LifecycleMBeanBase; -import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.modeler.BaseModelMBean; public class ContainerMBean extends BaseModelMBean { diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java b/java/org/apache/catalina/util/LifecycleMBeanBase.java index 6501364..9463291 100644 --- a/java/org/apache/catalina/util/LifecycleMBeanBase.java +++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java @@ -18,7 +18,6 @@ package org.apache.catalina.util; import javax.management.InstanceNotFoundException; -import javax.management.MBeanRegistration; import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; @@ -133,8 +132,8 @@ public abstract class LifecycleMBeanBase extends LifecycleBase /** * Utility method to enable sub-classes to easily register additional - * components that don't implement {@link MBeanRegistration} with - * an MBean server.<br> + * components that don't implement {@link JmxEnabled} with an MBean server. + * <br> * Note: This method should only be used once {@link #initInternal()} has * been called and before {@link #destroyInternal()} has been called. * --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org