amyroh 02/04/03 14:22:57
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Change the MBean nomenclature for Valve.
Revision Changes Path
1.31 +13 -13
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- MBeanUtils.java 22 Mar 2002 19:27:26 -0000 1.30
+++ MBeanUtils.java 3 Apr 2002 22:22:57 -0000 1.31
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.31 2002/04/03 22:22:57 amyroh Exp $
+ * $Revision: 1.31 $
+ * $Date: 2002/04/03 22:22:57 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.30 $ $Date: 2002/03/22 19:27:26 $
+ * @version $Revision: 1.31 $ $Date: 2002/04/03 22:22:57 $
*/
public class MBeanUtils {
@@ -1183,15 +1183,15 @@
if (container instanceof Engine) {
Service service = ((Engine)container).getService();
- name = new ObjectName(domain + ":type=Valve,service=" +
- service.getName() + ",sequence=" +
- valve.hashCode());
+ name = new ObjectName(domain + ":type=Valve,sequence=" +
+ valve.hashCode() + ",service=" +
+ service.getName());
} else if (container instanceof Host) {
Service service = ((Engine)container.getParent()).getService();
- name = new ObjectName(domain + ":type=Valve,host=" +
+ name = new ObjectName(domain + ":type=Valve,sequence=" +
+ valve.hashCode() + ",host=" +
container.getName() + ",service=" +
- service.getName() + ",sequence=" +
- valve.hashCode());
+ service.getName() );
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1) {
@@ -1199,11 +1199,11 @@
}
Host host = (Host) container.getParent();
Service service = ((Engine) host.getParent()).getService();
- name = new ObjectName(domain + ":type=Valve,path=" +
+ name = new ObjectName(domain + ":type=Valve,sequence=" +
+ valve.hashCode() + ",path=" +
path + ",host=" +
host.getName() + ",service=" +
- service.getName() + ",sequence=" +
- valve.hashCode());
+ service.getName());
}
return (name);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
