This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 99a5bb3c82 Simplify registry method signature
99a5bb3c82 is described below
commit 99a5bb3c82c5497888db23e7f52ed6cfe9d9ce14
Author: remm <[email protected]>
AuthorDate: Thu Mar 20 12:24:38 2025 +0100
Simplify registry method signature
---
java/org/apache/catalina/core/ApplicationFilterConfig.java | 4 ++--
java/org/apache/catalina/core/NamingContextListener.java | 6 +++---
java/org/apache/catalina/core/StandardServer.java | 4 ++--
java/org/apache/catalina/core/StandardWrapper.java | 4 ++--
java/org/apache/catalina/ha/backend/CollectedInfo.java | 2 +-
java/org/apache/catalina/ha/deploy/FarmWarDeployer.java | 2 +-
java/org/apache/catalina/loader/WebappLoader.java | 4 ++--
java/org/apache/catalina/manager/JMXProxyServlet.java | 4 ++--
java/org/apache/catalina/manager/ManagerServlet.java | 2 +-
java/org/apache/catalina/manager/StatusManagerServlet.java | 2 +-
java/org/apache/catalina/mbeans/MBeanUtils.java | 4 ++--
java/org/apache/catalina/startup/HostConfig.java | 4 ++--
java/org/apache/catalina/util/LifecycleMBeanBase.java | 6 +++---
java/org/apache/coyote/AbstractProtocol.java | 12 ++++++------
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 ++--
java/org/apache/coyote/http2/Http2Protocol.java | 2 +-
java/org/apache/tomcat/util/modeler/Registry.java | 5 +----
.../modeler/modules/MbeansDescriptorsDigesterSource.java | 4 ++--
.../modules/MbeansDescriptorsIntrospectionSource.java | 2 +-
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 12 ++++++------
.../apache/catalina/core/TestApplicationFilterConfig.java | 2 +-
test/org/apache/catalina/mbeans/TestRegistration.java | 2 +-
22 files changed, 45 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index 1ca69d7164..cbf499de2f 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -321,7 +321,7 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
}
try {
oname = new ObjectName(onameStr);
- Registry.getRegistryNonNull(null, null).registerComponent(this,
oname, null);
+ Registry.getRegistry(null).registerComponent(this, oname, null);
} catch (Exception ex) {
log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
getFilterClass(), getFilterName()), ex);
}
@@ -332,7 +332,7 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
// unregister this component
if (oname != null) {
try {
- Registry.getRegistryNonNull(null,
null).unregisterComponent(oname);
+ Registry.getRegistry(null).unregisterComponent(oname);
if (log.isDebugEnabled()) {
log.debug(sm.getString("applicationFilterConfig.jmxUnregister",
getFilterClass(), getFilterName()));
}
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index f7af987c3f..37b06a0ec4 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -299,7 +299,7 @@ public class NamingContextListener implements
LifecycleListener, ContainerListen
// unregister mbeans.
if (!objectNames.isEmpty()) {
Collection<ObjectName> names = objectNames.values();
- Registry registry = Registry.getRegistryNonNull(null,
null);
+ Registry registry = Registry.getRegistry(null);
for (ObjectName objectName : names) {
registry.unregisterComponent(objectName);
}
@@ -998,7 +998,7 @@ public class NamingContextListener implements
LifecycleListener, ContainerListen
try {
ObjectName on = createObjectName(resource);
actualResource = envCtx.lookup(resource.getName());
- Registry.getRegistryNonNull(null,
null).registerComponent(actualResource, on, null);
+ Registry.getRegistry(null).registerComponent(actualResource,
on, null);
objectNames.put(resource.getName(), on);
} catch (Exception e) {
log.warn(sm.getString("naming.jmxRegistrationFailed", e));
@@ -1189,7 +1189,7 @@ public class NamingContextListener implements
LifecycleListener, ContainerListen
ObjectName on = objectNames.get(name);
if (on != null) {
- Registry.getRegistryNonNull(null, null).unregisterComponent(on);
+ Registry.getRegistry(null).unregisterComponent(on);
}
}
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 208b92f69d..f2f5620335 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -801,7 +801,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
try {
// Note: Hard-coded domain used since this object is per Server/JVM
ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
- MBeanServer server = Registry.getRegistryNonNull(null,
null).getMBeanServer();
+ MBeanServer server = Registry.getRegistry(null).getMBeanServer();
if (server.isRegistered(sname)) {
server.invoke(sname, "storeConfig", null, null);
} else {
@@ -828,7 +828,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
try {
// Note: Hard-coded domain used since this object is per Server/JVM
ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
- MBeanServer server = Registry.getRegistryNonNull(null,
null).getMBeanServer();
+ MBeanServer server = Registry.getRegistry(null).getMBeanServer();
if (server.isRegistered(sname)) {
server.invoke(sname, "store", new Object[] { context }, new
String[] { "java.lang.String" });
} else {
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 6f92a053fa..2cf2cdd0ee 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -860,7 +860,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
try {
jspMonitorON = new ObjectName(oname.toString());
- Registry.getRegistryNonNull(null,
null).registerComponent(instance, jspMonitorON, null);
+ Registry.getRegistry(null).registerComponent(instance,
jspMonitorON, null);
} catch (Exception ex) {
log.warn(sm.getString("standardWrapper.jspMonitorError",
instance));
}
@@ -1151,7 +1151,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
instance = null;
if (isJspServlet && jspMonitorON != null) {
- Registry.getRegistryNonNull(null,
null).unregisterComponent(jspMonitorON);
+ Registry.getRegistry(null).unregisterComponent(jspMonitorON);
}
if (singleThreadModel && (instancePool != null)) {
diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 58302f0691..3c791eff62 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -55,7 +55,7 @@ public class CollectedInfo {
public void init(String host, int port) throws Exception {
int iport = 0;
String shost = null;
- mBeanServer = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ mBeanServer = Registry.getRegistry(null).getMBeanServer();
String onStr = "*:type=ThreadPool,*";
ObjectName objectName = new ObjectName(onStr);
Set<ObjectInstance> set = mBeanServer.queryMBeans(objectName, null);
diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index 0800e64442..0280eb7463 100644
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -163,7 +163,7 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
configBase = host.getConfigBaseFile();
// Retrieve the MBean server
- mBeanServer = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ mBeanServer = Registry.getRegistry(null).getMBeanServer();
started = true;
count = 0;
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 297fb161e1..e9e6758a41 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -372,7 +372,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader, Property
ObjectName cloname =
new ObjectName(context.getDomain() + ":type=" +
classLoader.getClass().getSimpleName() + ",host=" +
context.getParent().getName() + ",context=" +
contextName);
- Registry.getRegistryNonNull(null,
null).registerComponent(classLoader, cloname, null);
+ Registry.getRegistry(null).registerComponent(classLoader, cloname,
null);
} catch (Throwable t) {
Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(t);
@@ -421,7 +421,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader, Property
ObjectName cloname =
new ObjectName(context.getDomain() + ":type=" +
classLoader.getClass().getSimpleName() +
",host=" + context.getParent().getName() +
",context=" + contextName);
- Registry.getRegistryNonNull(null,
null).unregisterComponent(cloname);
+ Registry.getRegistry(null).unregisterComponent(cloname);
} catch (Exception e) {
log.warn(sm.getString("webappLoader.stopError"), e);
}
diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java
b/java/org/apache/catalina/manager/JMXProxyServlet.java
index 61c296a01e..323a8299c6 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -68,8 +68,8 @@ public class JMXProxyServlet extends HttpServlet {
@Override
public void init() throws ServletException {
// Retrieve the MBean server
- registry = Registry.getRegistryNonNull(null, null);
- mBeanServer = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ registry = Registry.getRegistry(null);
+ mBeanServer = Registry.getRegistry(null).getMBeanServer();
}
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 92f6725f38..ac5d4c65d7 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -245,7 +245,7 @@ public class ManagerServlet extends HttpServlet implements
ContainerServlet {
}
// Retrieve the MBean server
- mBeanServer = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ mBeanServer = Registry.getRegistry(null).getMBeanServer();
}
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 8f9bdc4833..ed62d6b0c3 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -94,7 +94,7 @@ public class StatusManagerServlet extends HttpServlet
implements NotificationLis
public void init() throws ServletException {
// Retrieve the MBean server
- mBeanServer = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ mBeanServer = Registry.getRegistry(null).getMBeanServer();
try {
diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java
b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 2ae614356b..04af80a2d3 100644
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -513,7 +513,7 @@ public class MBeanUtils {
*/
public static synchronized Registry createRegistry() {
if (registry == null) {
- registry = Registry.getRegistryNonNull(null, null);
+ registry = Registry.getRegistry(null);
ClassLoader cl = MBeanUtils.class.getClassLoader();
registry.loadDescriptors("org.apache.catalina.mbeans", cl);
@@ -544,7 +544,7 @@ public class MBeanUtils {
*/
public static synchronized MBeanServer createServer() {
if (mserver == null) {
- mserver = Registry.getRegistryNonNull(null, null).getMBeanServer();
+ mserver = Registry.getRegistry(null).getMBeanServer();
}
return mserver;
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index f71a78b9a7..0ea1276a00 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1563,7 +1563,7 @@ public class HostConfig implements LifecycleListener {
try {
ObjectName hostON = host.getObjectName();
oname = new ObjectName(hostON.getDomain() + ":type=Deployer,host="
+ host.getName());
- Registry.getRegistryNonNull(null, null).registerComponent(this,
oname, this.getClass().getName());
+ Registry.getRegistry(null).registerComponent(this, oname,
this.getClass().getName());
} catch (Exception e) {
log.warn(sm.getString("hostConfig.jmx.register", oname), e);
}
@@ -1591,7 +1591,7 @@ public class HostConfig implements LifecycleListener {
if (oname != null) {
try {
- Registry.getRegistryNonNull(null,
null).unregisterComponent(oname);
+ Registry.getRegistry(null).unregisterComponent(oname);
} catch (Exception e) {
log.warn(sm.getString("hostConfig.jmx.unregister", oname), e);
}
diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java
b/java/org/apache/catalina/util/LifecycleMBeanBase.java
index f15c086948..b005abb923 100644
--- a/java/org/apache/catalina/util/LifecycleMBeanBase.java
+++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java
@@ -123,7 +123,7 @@ public abstract class LifecycleMBeanBase extends
LifecycleBase implements JmxEna
try {
on = new ObjectName(name.toString());
- Registry.getRegistryNonNull(null, null).registerComponent(obj, on,
null);
+ Registry.getRegistry(null).registerComponent(obj, on, null);
} catch (Exception e) {
log.warn(sm.getString("lifecycleMBeanBase.registerFail", obj,
name), e);
}
@@ -143,7 +143,7 @@ public abstract class LifecycleMBeanBase extends
LifecycleBase implements JmxEna
protected final void unregister(String objectNameKeyProperties) {
// Construct an object name with the right domain
String name = getDomain() + ':' + objectNameKeyProperties;
- Registry.getRegistryNonNull(null, null).unregisterComponent(name);
+ Registry.getRegistry(null).unregisterComponent(name);
}
@@ -156,7 +156,7 @@ public abstract class LifecycleMBeanBase extends
LifecycleBase implements JmxEna
* @param on The name of the component to unregister
*/
protected final void unregister(ObjectName on) {
- Registry.getRegistryNonNull(null, null).unregisterComponent(on);
+ Registry.getRegistry(null).unregisterComponent(on);
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index ae168597d7..e605a271c6 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -646,14 +646,14 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
// Component not pre-registered so register it
oname = createObjectName();
if (oname != null) {
- Registry.getRegistryNonNull(null,
null).registerComponent(this, oname, null);
+ Registry.getRegistry(null).registerComponent(this, oname,
null);
}
}
if (this.domain != null) {
ObjectName rgOname = new ObjectName(domain +
":type=GlobalRequestProcessor,name=" + getName());
this.rgOname = rgOname;
- Registry.getRegistryNonNull(null,
null).registerComponent(getHandler().getGlobal(), rgOname, null);
+
Registry.getRegistry(null).registerComponent(getHandler().getGlobal(), rgOname,
null);
}
String endpointName = getName();
@@ -764,7 +764,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
} finally {
if (oname != null) {
if (mserver == null) {
- Registry.getRegistryNonNull(null,
null).unregisterComponent(oname);
+ Registry.getRegistry(null).unregisterComponent(oname);
} else {
// Possibly registered with a different MBeanServer
try {
@@ -777,7 +777,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
ObjectName rgOname = getGlobalRequestProcessorMBeanName();
if (rgOname != null) {
- Registry.getRegistryNonNull(null,
null).unregisterComponent(rgOname);
+ Registry.getRegistry(null).unregisterComponent(rgOname);
}
}
}
@@ -1180,7 +1180,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
if (getLog().isTraceEnabled()) {
getLog().trace("Register [" + processor + "] as ["
+ rpName + "]");
}
- Registry.getRegistryNonNull(null,
null).registerComponent(rp, rpName, null);
+ Registry.getRegistry(null).registerComponent(rp,
rpName, null);
rp.setRpName(rpName);
} catch (Exception e) {
getLog().warn(sm.getString("abstractProtocol.processorRegisterError"), e);
@@ -1204,7 +1204,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
if (getLog().isTraceEnabled()) {
getLog().trace("Unregister [" + rpName + "]");
}
- Registry.getRegistryNonNull(null,
null).unregisterComponent(rpName);
+ Registry.getRegistry(null).unregisterComponent(rpName);
rp.setRpName(null);
} catch (Exception e) {
getLog().warn(sm.getString("abstractProtocol.processorUnregisterError"), e);
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index e2592c146b..1f1c210525 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -95,7 +95,7 @@ public abstract class AbstractHttp11Protocol<S> extends
AbstractProtocol<S> {
// be de-registered.
ObjectName rgOname = getGlobalRequestProcessorMBeanName();
if (rgOname != null) {
- Registry registry = Registry.getRegistryNonNull(null, null);
+ Registry registry = Registry.getRegistry(null);
ObjectName query = new ObjectName(rgOname.getCanonicalName() +
",Upgrade=*");
Set<ObjectInstance> upgrades =
registry.getMBeanServer().queryMBeans(query, null);
for (ObjectInstance upgrade : upgrades) {
@@ -709,7 +709,7 @@ public abstract class AbstractHttp11Protocol<S> extends
AbstractProtocol<S> {
ObjectName oname = getONameForUpgrade(upgradeProtocol);
if (oname != null) {
try {
- Registry.getRegistryNonNull(null,
null).registerComponent(result, oname, null);
+
Registry.getRegistry(null).registerComponent(result, oname, null);
} catch (Exception e) {
getLog().warn(sm.getString("abstractHttp11Protocol.upgradeJmxRegistrationFail"),
e);
result = null;
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java
b/java/org/apache/coyote/http2/Http2Protocol.java
index 4f1014b504..a7cb153676 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -491,7 +491,7 @@ public class Http2Protocol implements UpgradeProtocol {
ObjectName oname =
this.http11Protocol.getONameForUpgrade(getUpgradeProtocolName());
// This can be null when running the testsuite
if (oname != null) {
- Registry.getRegistryNonNull(null,
null).registerComponent(global, oname, null);
+ Registry.getRegistry(null).registerComponent(global, oname,
null);
}
} catch (Exception e) {
log.warn(sm.getString("http2Protocol.jmxRegistration.fail"), e);
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index be18708775..6bae194aa4 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -136,14 +136,11 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
* Factory method to create (if necessary) and return our
* <code>Registry</code> instance.
*
- * @param key Unused
* @param guard Prevent access to the registry by untrusted components
- *
* @return the registry
* @throws IllegalArgumentException if the guard object does not allow
access
- * @since 1.1
*/
- public static synchronized Registry getRegistryNonNull(Object key, Object
guard) {
+ public static synchronized Registry getRegistry(Object guard) {
if (registry == null) {
registry = new Registry();
registry.guard = guard;
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 3c7bd215a8..2c67f88d71 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -44,7 +44,7 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
Digester digester = new Digester();
digester.setNamespaceAware(false);
digester.setValidating(false);
- URL url = Registry.getRegistryNonNull(null,
null).getClass().getResource
+ URL url = Registry.getRegistry(null).getClass().getResource
("/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd");
if (url != null) {
digester.register
@@ -151,7 +151,7 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
public void execute() throws Exception {
if (registry == null) {
- registry = Registry.getRegistryNonNull(null, null);
+ registry = Registry.getRegistry(null);
}
InputStream stream = (InputStream) source;
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index dead9796b8..2132f05a96 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -76,7 +76,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
public void execute() throws Exception {
if( registry==null ) {
- registry=Registry.getRegistryNonNull(null, null);
+ registry=Registry.getRegistry(null);
}
try {
ManagedBean managed = createManagedBean(registry, null,
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index ff01a6a56a..6e29faaa15 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1389,12 +1389,12 @@ public abstract class AbstractEndpoint<S,U> {
if (this.domain != null) {
// Register endpoint (as ThreadPool - historical name)
oname = new ObjectName(domain + ":type=ThreadPool,name=\"" +
getName() + "\"");
- Registry.getRegistryNonNull(null, null).registerComponent(this,
oname, null);
+ Registry.getRegistry(null).registerComponent(this, oname, null);
ObjectName socketPropertiesOname = new ObjectName(domain +
":type=SocketProperties,name=\"" + getName() + "\"");
socketProperties.setObjectName(socketPropertiesOname);
- Registry.getRegistryNonNull(null,
null).registerComponent(socketProperties, socketPropertiesOname, null);
+ Registry.getRegistry(null).registerComponent(socketProperties,
socketPropertiesOname, null);
for (SSLHostConfig sslHostConfig : findSslHostConfigs()) {
registerJmx(sslHostConfig);
@@ -1414,7 +1414,7 @@ public abstract class AbstractEndpoint<S,U> {
getName() + "\",name=" +
ObjectName.quote(sslHostConfig.getHostName()));
sslHostConfig.setObjectName(sslOname);
try {
- Registry.getRegistryNonNull(null,
null).registerComponent(sslHostConfig, sslOname, null);
+ Registry.getRegistry(null).registerComponent(sslHostConfig,
sslOname, null);
} catch (Exception e) {
getLog().warn(sm.getString("endpoint.jmxRegistrationFailed",
sslOname), e);
}
@@ -1432,7 +1432,7 @@ public abstract class AbstractEndpoint<S,U> {
",name=" + sslHostConfigCert.getType());
sslHostConfigCert.setObjectName(sslCertOname);
try {
- Registry.getRegistryNonNull(null, null).registerComponent(
+ Registry.getRegistry(null).registerComponent(
sslHostConfigCert, sslCertOname, null);
} catch (Exception e) {
getLog().warn(sm.getString("endpoint.jmxRegistrationFailed", sslCertOname), e);
@@ -1446,7 +1446,7 @@ public abstract class AbstractEndpoint<S,U> {
private void unregisterJmx(SSLHostConfig sslHostConfig) {
- Registry registry = Registry.getRegistryNonNull(null, null);
+ Registry registry = Registry.getRegistry(null);
registry.unregisterComponent(sslHostConfig.getObjectName());
for (SSLHostConfigCertificate sslHostConfigCert :
sslHostConfig.getCertificates()) {
registry.unregisterComponent(sslHostConfigCert.getObjectName());
@@ -1510,7 +1510,7 @@ public abstract class AbstractEndpoint<S,U> {
unbind();
bindState = BindState.UNBOUND;
}
- Registry registry = Registry.getRegistryNonNull(null, null);
+ Registry registry = Registry.getRegistry(null);
registry.unregisterComponent(oname);
registry.unregisterComponent(socketProperties.getObjectName());
for (SSLHostConfig sslHostConfig : findSslHostConfigs()) {
diff --git a/test/org/apache/catalina/core/TestApplicationFilterConfig.java
b/test/org/apache/catalina/core/TestApplicationFilterConfig.java
index 63f05751b1..88b4d482e4 100644
--- a/test/org/apache/catalina/core/TestApplicationFilterConfig.java
+++ b/test/org/apache/catalina/core/TestApplicationFilterConfig.java
@@ -53,7 +53,7 @@ public class TestApplicationFilterConfig extends
TomcatBaseTest {
tomcat.start();
final MBeanServer mbeanServer =
- Registry.getRegistryNonNull(null, null).getMBeanServer();
+ Registry.getRegistry(null).getMBeanServer();
// There should be one Servlet MBean registered
Set<ObjectName> servlets = mbeanServer.queryNames(
diff --git a/test/org/apache/catalina/mbeans/TestRegistration.java
b/test/org/apache/catalina/mbeans/TestRegistration.java
index 2ab8f45d15..6eaa454f8a 100644
--- a/test/org/apache/catalina/mbeans/TestRegistration.java
+++ b/test/org/apache/catalina/mbeans/TestRegistration.java
@@ -147,7 +147,7 @@ public class TestRegistration extends TomcatBaseTest {
*/
@Test
public void testMBeanDeregistration() throws Exception {
- final MBeanServer mbeanServer = Registry.getRegistryNonNull(null,
null).getMBeanServer();
+ final MBeanServer mbeanServer =
Registry.getRegistry(null).getMBeanServer();
// Verify there are no Catalina or Tomcat MBeans
Set<ObjectName> onames = mbeanServer.queryNames(new
ObjectName("Catalina:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
