manveen 02/03/21 17:21:56
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Fix for create*Logger's.
Revision Changes Path
1.18 +14 -9
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MBeanFactory.java 21 Mar 2002 21:19:10 -0000 1.17
+++ MBeanFactory.java 22 Mar 2002 01:21:55 -0000 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.17 2002/03/21 21:19:10 amyroh Exp $
- * $Revision: 1.17 $
- * $Date: 2002/03/21 21:19:10 $
+ * $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 $
*
* ====================================================================
*
@@ -116,7 +116,7 @@
* <code>org.apache.catalina.core.StandardServer</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.17 $ $Date: 2002/03/21 21:19:10 $
+ * @version $Revision: 1.18 $ $Date: 2002/03/22 01:21:55 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -273,7 +273,9 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
- String tname = findObjectName(type);
+ // FIX ME
+ // String tname = findObjectName(type);
+ String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -832,7 +834,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();
@@ -844,7 +847,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
- Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+ Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setLogger(logger);
}
@@ -873,7 +876,9 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
- String tname = findObjectName(type);
+ // FIX ME
+ //String tname = findObjectName(type);
+ String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -885,7 +890,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
- Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+ Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setLogger(logger);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
