- Port patch to return connector names.

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

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index b41c000..99415be 100644 (file)
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -280,11 +280,8 @@ public class StandardService
 
     public ObjectName[] getConnectorNames() {
         ObjectName results[] = new ObjectName[connectors.length];
-        for( int i=0; i<results.length; i++ ) {
-            // if it's a coyote connector
-            //if( connectors[i] instanceof CoyoteConnector ) {
-            //    results[i]=((CoyoteConnector)connectors[i]).getJmxName();
-            //}
+        for (int i=0; i<results.length; i++) {
+            results[i] = connectors[i].getObjectName();
         }
         return results;
     }