From a671c472c18975e9bb4fcd124d866fabcc258de1 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 24 May 2009 18:45:24 +0000 Subject: [PATCH] Doh. Commit complete patch to remove ServerFactory rather than previous half-finished version. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@778210 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/mbeans/MBeanFactory.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java index b4f90c4ca..2ebb12ab4 100644 --- a/java/org/apache/catalina/mbeans/MBeanFactory.java +++ b/java/org/apache/catalina/mbeans/MBeanFactory.java @@ -29,7 +29,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Engine; import org.apache.catalina.Host; import org.apache.catalina.Server; -import org.apache.catalina.ServerFactory; import org.apache.catalina.Service; import org.apache.catalina.Valve; import org.apache.catalina.authenticator.SingleSignOn; @@ -218,9 +217,8 @@ public class MBeanFactory extends BaseModelMBean { StandardService service = null; String domain = oname.getDomain(); - if (container instanceof Service) { - Server server = ServerFactory.getServer(); - Service[] services = server.findServices(); + if (container instanceof Server) { + Service[] services = ((Server)container).findServices(); for (int i = 0; i < services.length; i++) { service = (StandardService) services[i]; if (domain.equals(service.getObjectName().getDomain())) { -- 2.11.0