Author: pero
Date: Thu Jan 18 08:59:32 2007
New Revision: 497499

URL: http://svn.apache.org/viewvc?view=rev&rev=497499
Log:
StandardService.getConnectorNames() return array of Connector JMX objectnames.

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java?view=diff&rev=497499&r1=497498&r2=497499
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
 Thu Jan 18 08:59:32 2007
@@ -281,10 +281,7 @@
     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();
-            //}
+            results[i]=connectors[i].getObjectName();
         }
         return results;
     }

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml?view=diff&rev=497499&r1=497498&r2=497499
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
 Thu Jan 18 08:59:32 2007
@@ -589,6 +589,11 @@
                  description="Connector object"
                  type="org.apache.catalina.connector.Connector"/>
     </operation>
+    <operation name="getConnectorNames"
+               description="get all JMX connector names"
+               impact="ACTION"
+               returnType="[Ljavax.management.ObjectName;">
+    </operation>
     
     <operation name="start" description="Start" impact="ACTION" 
returnType="void" />
     <operation name="stop" description="Stop" impact="ACTION" 
returnType="void" />

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=497499&r1=497498&r2=497499
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jan 18 08:59:32 2007
@@ -18,6 +18,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>41401</bug>: StandardService.getConnectorNames() return array of 
+        Connector JMX objectnames. (pero)
+      </fix>
+      <fix>
         <bug>29727</bug>: If env-entry values in web.xml are changed then
         ensure new values are applied when context is reloaded. (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to