This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9df3d4dcd11a78045aea319405b86513f7bcfa1c Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Oct 12 15:22:16 2020 +0100 Fix BZ 84805 Correct imports https://bz.apache.org/bugzilla/show_bug.cgi?id=64805 --- java/org/apache/catalina/manager/JMXProxyServlet.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java b/java/org/apache/catalina/manager/JMXProxyServlet.java index d6eeb70..d64087f 100644 --- a/java/org/apache/catalina/manager/JMXProxyServlet.java +++ b/java/org/apache/catalina/manager/JMXProxyServlet.java @@ -37,8 +37,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.mbeans.MBeanDumper; -import org.apache.catalina.tribes.util.StringManager; import org.apache.tomcat.util.modeler.Registry; +import org.apache.tomcat.util.res.StringManager; /** * This servlet will dump JMX attributes in a simple format and implement proxy diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e9afa82..ea25154 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -57,6 +57,10 @@ <update> Add connection pooling to JNDI realm. (remm) </update> + <fix> + <bug>64805</bug>: Correct imports used by <code>JMXPorxyServlet</code>. + (markt) + </fix> </changelog> </subsection> <subseciton name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org