Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 35484 invoked from network); 29 Apr 2003 00:59:13 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 29 Apr 2003 00:59:13 -0000 Received: (qmail 2186 invoked by uid 97); 29 Apr 2003 01:01:20 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 2179 invoked from network); 29 Apr 2003 01:01:19 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 29 Apr 2003 01:01:19 -0000 Received: (qmail 34612 invoked by uid 500); 29 Apr 2003 00:59:04 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 34597 invoked by uid 500); 29 Apr 2003 00:59:04 -0000 Received: (qmail 34593 invoked from network); 29 Apr 2003 00:59:03 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 29 Apr 2003 00:59:03 -0000 Received: (qmail 87724 invoked by uid 1290); 29 Apr 2003 00:59:03 -0000 Date: 29 Apr 2003 00:59:03 -0000 Message-ID: <20030429005903.87723.qmail@icarus.apache.org> From: amyroh@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java mbeans-descriptors.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N amyroh 2003/04/28 17:59:03 Modified: catalina/src/share/org/apache/catalina/core StandardContext.java mbeans-descriptors.xml Log: Fix to return String instead of ObjectName for WebModule getServlets. Revision Changes Path 1.48 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java Index: StandardContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- StandardContext.java 28 Apr 2003 05:19:31 -0000 1.47 +++ StandardContext.java 29 Apr 2003 00:59:02 -0000 1.48 @@ -4959,11 +4959,11 @@ * * @return list of all servlets ( we know about ) */ - public ObjectName[] getServlets() { + public String[] getServlets() { int size=wrappers.size(); - ObjectName result[]=new ObjectName[size]; + String result[]=new String[size]; for( int i=0; i< size; i++ ) { - result[i]=((StandardWrapper)wrappers.get(i)).getJmxName(); + result[i]=((StandardWrapper)wrappers.get(i)).getObjectName(); } return result; } 1.13 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mbeans-descriptors.xml 28 Apr 2003 05:19:31 -0000 1.12 +++ mbeans-descriptors.xml 29 Apr 2003 00:59:02 -0000 1.13 @@ -179,7 +179,7 @@