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
The following commit(s) were added to refs/heads/8.5.x by this push:
new d5883af Restore use of guard which was accidently removed in a
previous clean up
d5883af is described below
commit d5883af8189a01130b8a8073e1b9b7a312e73ca3
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 27 13:11:47 2021 +0100
Restore use of guard which was accidently removed in a previous clean up
Clean up was in 8b888234
---
java/org/apache/tomcat/util/modeler/Registry.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index dab256b..93d3576 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -134,6 +134,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
public static synchronized Registry getRegistry(Object key, Object guard) {
if (registry == null) {
registry = new Registry();
+ registry.guard = guard;
}
if (registry.guard != null && registry.guard != guard) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
