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-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java MBeanUtils.java
Date Fri, 22 Mar 2002 19:27:27 GMT
amyroh      02/03/22 11:27:27

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanFactory.java MBeanUtils.java
  Log:
  Fix createObjectName for Host.  It should be "host=" instead of "name=".
  
  Revision  Changes    Path
  1.20      +8 -8      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MBeanFactory.java	22 Mar 2002 02:42:42 -0000	1.19
  +++ MBeanFactory.java	22 Mar 2002 19:27:26 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.19 2002/03/22 02:42:42 manveen Exp $
  - * $Revision: 1.19 $
  - * $Date: 2002/03/22 02:42:42 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.20 2002/03/22 19:27:26 amyroh Exp $
  + * $Revision: 1.20 $
  + * $Date: 2002/03/22 19:27:26 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    * <code>org.apache.catalina.core.StandardServer</code> component.</p>
    *
    * @author Amy Roh
  - * @version $Revision: 1.19 $ $Date: 2002/03/22 02:42:42 $
  + * @version $Revision: 1.20 $ $Date: 2002/03/22 19:27:26 $
    */
   
   public class MBeanFactory extends BaseModelMBean {
  @@ -287,7 +287,7 @@
           } else if (tname.equals("Engine")) {
               engine.setLogger(fileLogger);
           } else if (tname.equals("Host")) {
  -            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
               host.setLogger(fileLogger);
           }
   
  @@ -847,7 +847,7 @@
           } else if (tname.equals("Engine")) {
               engine.setLogger(logger);
           } else if (tname.equals("Host")) {
  -            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
               host.setLogger(logger);
           }
   
  @@ -890,7 +890,7 @@
           } else if (tname.equals("Engine")) {
               engine.setLogger(logger);
           } else if (tname.equals("Host")) {
  -            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
               host.setLogger(logger);
           }
   
  @@ -931,7 +931,7 @@
           } else if (tname.equals("Engine")) {
               engine.setRealm(realm);
           } else if (tname.equals("Host")) {
  -            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
               host.setRealm(realm);
           }
   
  
  
  
  1.30      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- MBeanUtils.java	8 Mar 2002 19:01:32 -0000	1.29
  +++ MBeanUtils.java	22 Mar 2002 19:27:26 -0000	1.30
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.29 2002/03/08 19:01:32 craigmcc Exp $
  - * $Revision: 1.29 $
  - * $Date: 2002/03/08 19:01:32 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.30 2002/03/22 19:27:26 amyroh Exp $
  + * $Revision: 1.30 $
  + * $Date: 2002/03/22 19:27:26 $
    *
    * ====================================================================
    *
  @@ -109,7 +109,7 @@
    *
    * @author Craig R. McClanahan
    * @author Amy Roh
  - * @version $Revision: 1.29 $ $Date: 2002/03/08 19:01:32 $
  + * @version $Revision: 1.30 $ $Date: 2002/03/22 19:27:26 $
    */
   
   public class MBeanUtils {
  @@ -855,7 +855,7 @@
           ObjectName name = null;
           Engine engine = (Engine)host.getParent();
           Service service = engine.getService();
  -        name = new ObjectName(domain + ":type=Host,name=" +
  +        name = new ObjectName(domain + ":type=Host,host=" +
                                 host.getName() + ",service=" +
                                 service.getName());
           return (name);
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message