svn commit: r910134 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

[markt]

Author: markt
Date: Mon Feb 15 00:06:05 2010
New Revision: 910134

URL: http://svn.apache.org/viewvc?rev=910134&view=rev
Log:
Use the Context interface rather than StandardEngine

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=910134&r1=910133&r2=910134&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Feb 15 
00:06:05 2010
@@ -18,7 +18,6 @@
 
 package org.apache.catalina.connector;
 
-import java.net.URLEncoder;
 import java.util.HashMap;
 
 import javax.management.MBeanRegistration;
@@ -32,7 +31,6 @@
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Service;
 import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardEngine;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.coyote.Adapter;
@@ -963,11 +961,11 @@
 
         this.initialized = true;
 
-        if( oname == null && (container instanceof StandardEngine)) {
+        if (oname == null) {
             try {
                 // we are loaded directly, via API - and no name was given to 
us
-                StandardEngine cb=(StandardEngine)container;
-                oname = createObjectName(cb.getName(), "Connector");
+                // Engine name is used as domain name for MBeans
+                oname = createObjectName(container.getName(), "Connector");
                 Registry.getRegistry(null, null)
                     .registerComponent(this, oname, null);
                 controller=oname;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org