Author: markt
Date: Sun May 24 18:45:24 2009
New Revision: 778210
URL: http://svn.apache.org/viewvc?rev=778210&view=rev
Log:
Doh. Commit complete patch to remove ServerFactory rather than previous
half-finished version.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=778210&r1=778209&r2=778210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun May 24
18:45:24 2009
@@ -29,7 +29,6 @@
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 @@
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())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
