This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 7b68fb5 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63981 7b68fb5 is described below commit 7b68fb58c41efe5955620cfc05621bc52ef268c2 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Dec 2 21:51:23 2019 +0000 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63981 Allow multiple calls to disableRegistry() without logging warnings. Based on a patch by Andy Wilkinson. --- java/org/apache/tomcat/util/modeler/Registry.java | 2 +- webapps/docs/changelog.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java index 89abd43..b38af7a 100644 --- a/java/org/apache/tomcat/util/modeler/Registry.java +++ b/java/org/apache/tomcat/util/modeler/Registry.java @@ -151,7 +151,7 @@ public class Registry implements RegistryMBean, MBeanRegistration { public static synchronized void disableRegistry() { if (registry == null) { registry = new NoDescriptorRegistry(); - } else { + } else if (!(registry instanceof NoDescriptorRegistry)) { log.warn(sm.getString("registry.noDisable")); } } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c7eb551..7919779 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -75,6 +75,12 @@ an origin without a deafult port and origins are now compared in a case-sensitive manner as required by the CORS specification. (markt) </fix> + <fix> + <bug>63981</bug>: Allow multiple calls to + <code>Registry.disableRegistry()</code> without the second and + subsequent calls triggering the logging of a warning. Based on a patch + by Andy Wilkinson. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org