Use the Context interface rather than StandardEngine

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910134 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index ac3c393..f134e65 100644 (file)
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -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.LifecycleException;
 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 @@ public class Connector
 
         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;