Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 16727 invoked from network); 13 May 2003 00:11:40 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 13 May 2003 00:11:40 -0000 Received: (qmail 22067 invoked by uid 97); 13 May 2003 00:13:51 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 22060 invoked from network); 13 May 2003 00:13:50 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 13 May 2003 00:13:50 -0000 Received: (qmail 15870 invoked by uid 500); 13 May 2003 00:11:32 -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 15859 invoked by uid 500); 13 May 2003 00:11:32 -0000 Received: (qmail 15856 invoked from network); 13 May 2003 00:11:32 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 13 May 2003 00:11:32 -0000 Received: (qmail 95322 invoked by uid 1290); 13 May 2003 00:11:31 -0000 Date: 13 May 2003 00:11:31 -0000 Message-ID: <20030513001131.95321.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/mbeans MBeanFactory.java 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/05/12 17:11:31 Modified: catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java Log: Return null for objectName when initialization fails. Revision Changes Path 1.16 +11 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java Index: MBeanFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- MBeanFactory.java 8 May 2003 22:41:35 -0000 1.15 +++ MBeanFactory.java 13 May 2003 00:11:31 -0000 1.16 @@ -952,12 +952,13 @@ if (containerBase != null) { containerBase.setManager(manager); } - //ObjectName oname = manager.getObjectName(); - // FIXME getObjectName() returns null - ObjectName oname = - MBeanUtils.createObjectName(pname.getDomain(), manager); - return (oname.toString()); - + ObjectName oname = manager.getObjectName(); + if (oname != null) { + return (oname.toString()); + } else { + return null; + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org