tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
Date Tue, 13 May 2003 00:11:31 GMT
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


Mime
View raw message