cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java

[manveen]

manveen     02/03/21 18:42:42

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanFactory.java
  Log:
  fix for createUserDatabaseRealm
  
  Revision  Changes    Path
  1.19      +9 -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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- MBeanFactory.java 22 Mar 2002 01:21:55 -0000      1.18
  +++ MBeanFactory.java 22 Mar 2002 02:42:42 -0000      1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
 1.18 2002/03/22 01:21:55 manveen Exp $
  - * $Revision: 1.18 $
  - * $Date: 2002/03/22 01:21:55 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    * <code>org.apache.catalina.core.StandardServer</code> component.</p>
    *
    * @author Amy Roh
  - * @version $Revision: 1.18 $ $Date: 2002/03/22 01:21:55 $
  + * @version $Revision: 1.19 $ $Date: 2002/03/22 02:42:42 $
    */
   
   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("host"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
               host.setLogger(fileLogger);
           }
   
  @@ -918,7 +918,8 @@
           // Add the new instance to its parent component
           ObjectName pname = new ObjectName(parent);
           String type = pname.getKeyProperty("type");
  -        String tname = findObjectName(type);
  +        //String tname = findObjectName(type);
  +        String tname = type;
           Server server = ServerFactory.getServer();
           Service service = server.findService(pname.getKeyProperty("service"));
           Engine engine = (Engine) service.getContainer();
  @@ -930,12 +931,12 @@
           } else if (tname.equals("Engine")) {
               engine.setRealm(realm);
           } else if (tname.equals("Host")) {
  -            Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
  +            Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
               host.setRealm(realm);
           }
   
           // Return the corresponding MBean name
  -        ManagedBean managed = registry.findManagedBean("UserDatabseRealm");
  +        ManagedBean managed = registry.findManagedBean("UserDatabaseRealm");
           ObjectName oname =
               MBeanUtils.createObjectName(managed.getDomain(), realm);
           return (oname.toString());
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>