Attachment #18715 for bug #40246

View | Details | Raw Unified | Return to bug 40246
Collapse All | Expand All

Lines 17-22 Link Here

(-)jmx.old/AbstractDynamicMBean.java (+35 lines)
17	package org.apache.log4j.jmx;	17	package org.apache.log4j.jmx;
18		18
19	//import java.lang.reflect.Constructor;	19	//import java.lang.reflect.Constructor;
		20	import java.util.Collection;
20	import java.util.Iterator;	21	import java.util.Iterator;
21	import javax.management.DynamicMBean;	22	import javax.management.DynamicMBean;
22	import javax.management.AttributeList;	23	import javax.management.AttributeList;
Lines 25-30 Link Here
25	import javax.management.MBeanRegistration;	26	import javax.management.MBeanRegistration;
26	import javax.management.MBeanServer;	27	import javax.management.MBeanServer;
27	import javax.management.ObjectName;	28	import javax.management.ObjectName;
		29	import javax.management.InstanceAlreadyExistsException;
		30	import javax.management.InstanceNotFoundException;
		31	import javax.management.MBeanRegistrationException;
		32	import javax.management.NotCompliantMBeanException;
28		33
29	import org.apache.log4j.Logger;	34	import org.apache.log4j.Logger;
30		35
Lines 33-38 Link Here
33		38
34	String dClassName;	39	String dClassName;
35	MBeanServer server;	40	MBeanServer server;
		41
		42	/** List of MBean names which are registered internally. */
		43	private Collection mbeanList = new java.util.LinkedList();
36		44
37	/**	45	/**
38	* Enables the to get the values of several attributes of the Dynamic MBean.	46	* Enables the to get the values of several attributes of the Dynamic MBean.
Lines 112-121 Link Here
112	}	120	}
113		121
114		122
		123	/**
		124	* Registers MBean instance in the attached server. Must <em>NOT</em>
		125	* be called before registration if this instance.
		126	*/
		127	protected
		128	void registerMBean(Object mbean, ObjectName objectName)
		129	throws InstanceAlreadyExistsException, MBeanRegistrationException,
		130	NotCompliantMBeanException {
		131	server.registerMBean(mbean, objectName);
		132	mbeanList.add(objectName);
		133	}
115		134
		135	/**
		136	* Performs cleanup for deregistering this MBean. Default implementation
		137	* unregisters MBean instances which are registered using
		138	* {@link #registerMBean(Object mbean, ObjectName objectName)}.
		139	*/
116	public	140	public
117	void preDeregister() {	141	void preDeregister() {
118	getLogger().debug("preDeregister called.");	142	getLogger().debug("preDeregister called.");
		143	Iterator iterator = mbeanList.iterator();
		144	while (iterator.hasNext()) {
		145	ObjectName name = (ObjectName) iterator.next();
		146	try {
		147	server.unregisterMBean(name);
		148	} catch (InstanceNotFoundException e) {
		149	getLogger().warn("Missing MBean " + name.getCanonicalName());
		150	} catch (MBeanRegistrationException e) {
		151	getLogger().warn("Failed unregistering " + name.getCanonicalName());
		152	}
		153	}
119	}	154	}
120		155
121	public	156	public

Lines 192-198 Link Here

(-)jmx.old/AppenderDynamicMBean.java (-1 / +1 lines)
192	try {	192	try {
193	LayoutDynamicMBean appenderMBean = new LayoutDynamicMBean(layout);	193	LayoutDynamicMBean appenderMBean = new LayoutDynamicMBean(layout);
194	objectName = new ObjectName("log4j:appender="+name);	194	objectName = new ObjectName("log4j:appender="+name);
195	server.registerMBean(appenderMBean, objectName);	195	registerMBean(appenderMBean, objectName);
196		196
197	dAttributes.add(new MBeanAttributeInfo("appender="+name,	197	dAttributes.add(new MBeanAttributeInfo("appender="+name,
198	"javax.management.ObjectName",	198	"javax.management.ObjectName",

Lines 117-123 Link Here

(-)jmx.old/HierarchyDynamicMBean.java (-1 / +1 lines)
117	try {	117	try {
118	LoggerDynamicMBean loggerMBean = new LoggerDynamicMBean(logger);	118	LoggerDynamicMBean loggerMBean = new LoggerDynamicMBean(logger);
119	objectName = new ObjectName("log4j", "logger", name);	119	objectName = new ObjectName("log4j", "logger", name);
120	server.registerMBean(loggerMBean, objectName);	120	registerMBean(loggerMBean, objectName);
121		121
122	NotificationFilterSupport nfs = new NotificationFilterSupport();	122	NotificationFilterSupport nfs = new NotificationFilterSupport();
123	nfs.enableType(ADD_APPENDER+logger.getName());	123	nfs.enableType(ADD_APPENDER+logger.getName());

Lines 257-263 Link Here

(-)jmx.old/LoggerDynamicMBean.java (-1 / +1 lines)
257	try {	257	try {
258	AppenderDynamicMBean appenderMBean = new AppenderDynamicMBean(appender);	258	AppenderDynamicMBean appenderMBean = new AppenderDynamicMBean(appender);
259	objectName = new ObjectName("log4j", "appender", name);	259	objectName = new ObjectName("log4j", "appender", name);
260	server.registerMBean(appenderMBean, objectName);	260	registerMBean(appenderMBean, objectName);
261		261
262	dAttributes.add(new MBeanAttributeInfo("appender="+name,	262	dAttributes.add(new MBeanAttributeInfo("appender="+name,
263	"javax.management.ObjectName",	263	"javax.management.ObjectName",

Return to bug 40246