remm 2002/11/08 03:32:37 Modified: catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: - Fix bug creating and editing a resource link. Since name is part of the MBean name, it cannot be changed without removing the object. Revision Changes Path 1.7 +5 -8 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MBeanUtils.java 15 Oct 2002 19:08:33 -0000 1.6 +++ MBeanUtils.java 8 Nov 2002 11:32:37 -0000 1.7 @@ -990,7 +990,7 @@ resourceLink.getNamingResources().getContainer(); if (container instanceof Server) { name = new ObjectName(domain + ":type=ResourceLink" + - ",resourcetype=Global,class=" + resourceLink.getType() + + ",resourcetype=Global" + ",name=" + encodedResourceLinkName); } else if (container instanceof Context) { String path = ((Context)container).getPath(); @@ -1003,7 +1003,6 @@ ",resourcetype=Context,path=" + path + ",host=" + host.getName() + ",service=" + service.getName() + - ",class=" + resourceLink.getType() + ",name=" + encodedResourceLinkName); } else if (container instanceof DefaultContext) { container = ((DefaultContext)container).getParent(); @@ -1013,14 +1012,12 @@ name = new ObjectName(domain + ":type=ResourceLink" + ",resourcetype=HostDefaultContext,host=" + host.getName() + ",service=" + service.getName() + - ",class=" + resourceLink.getType() + ",name=" + encodedResourceLinkName); } else if (container instanceof Engine) { Engine engine = (Engine) container; Service service = engine.getService(); name = new ObjectName(domain + ":type=ResourceLink" + ",resourcetype=ServiceDefaultContext,service=" + service.getName() + - ",class=" + resourceLink.getType() + ",name=" + encodedResourceLinkName); } }
-- To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>