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 Sat, 03 May 2003 17:19:32 GMT
amyroh      2003/05/03 10:19:32

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanFactory.java
  Log:
  Fix NPE - RequestDumperValve.getObjectName returns null.
  
  Revision  Changes    Path
  1.14      +10 -5     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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MBeanFactory.java	17 Apr 2003 01:29:09 -0000	1.13
  +++ MBeanFactory.java	3 May 2003 17:19:32 -0000	1.14
  @@ -758,7 +758,12 @@
           ContainerBase containerBase = getParentContainerFromParent(pname);
           containerBase.addValve(valve);
           ObjectName oname = valve.getObjectName();
  -        return (oname.toString());
  +        if (oname != null) {
  +            return (oname.toString());
  +        } else {
  +            oname = MBeanUtils.createObjectName(pname.getDomain(), valve);
  +            return (oname.toString());
  +        }
   
       }
   
  
  
  

---------------------------------------------------------------------
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