amyroh 2003/03/22 18:12:22
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
Log:
Use MBeanUtils.createObjectName for now. Container.getObjectName returns null.
Revision Changes Path
1.9 +11 -6
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MBeanFactory.java 21 Mar 2003 08:16:21 -0000 1.8
+++ MBeanFactory.java 23 Mar 2003 02:12:22 -0000 1.9
@@ -870,9 +870,14 @@
Server server = ServerFactory.getServer();
server.addService(service);
Vector onames = new Vector();
- ObjectName oname = engine.getObjectName();
+ // FIXME service & engine.getObjectName
+ //ObjectName oname = engine.getObjectName();
+ ObjectName oname =
+ MBeanUtils.createObjectName(engineName, engine);
onames.add(0, oname);
- oname = service.getObjectName();
+ //oname = service.getObjectName();
+ oname =
+ MBeanUtils.createObjectName(engineName, service);
onames.add(1, oname);
return (onames);
1.15 +6 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MBeanUtils.java 20 Mar 2003 05:43:48 -0000 1.14
+++ MBeanUtils.java 23 Mar 2003 02:12:22 -0000 1.15
@@ -1500,7 +1500,8 @@
throws MalformedObjectNameException {
ObjectName name = null;
- name = new ObjectName(domain + ":type=Service");
+ name = new ObjectName(domain + ":type=Service,serviceName=" +
+ service.getName());
return (name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
