Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jetty-9.1

This commit is contained in:
Greg Wilkins 2013-09-12 15:12:43 +10:00
parent 710806b4fd 0e981d8d98
commit 6f0eee6ba4
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
View File

@ -23,6 +23,9 @@ import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.InstanceNotFoundException; import javax.management.InstanceNotFoundException;
import javax.management.MBeanRegistrationException; import javax.management.MBeanRegistrationException;
@ -42,10 +45,15 @@ import org.eclipse.jetty.util.log.Logger;
public class MBeanContainer implements Container.InheritedListener, Dumpable public class MBeanContainer implements Container.InheritedListener, Dumpable
{ {
private final static Logger LOG = Log.getLogger(MBeanContainer.class.getName()); private final static Logger LOG = Log.getLogger(MBeanContainer.class.getName());
private final static ConcurrentMap<String, AtomicInteger> __unique = new ConcurrentHashMap<String, AtomicInteger>();
public static void resetUnique()
{
__unique.clear();
}
private final MBeanServer _mbeanServer; private final MBeanServer _mbeanServer;
private final WeakHashMap<Object, ObjectName> _beans = new WeakHashMap<Object, ObjectName>(); private final WeakHashMap<Object, ObjectName> _beans = new WeakHashMap<Object, ObjectName>();
private final HashMap<String, Integer> _unique = new HashMap<String, Integer>();
private String _domain = null; private String _domain = null;
/** /**
@ -186,11 +194,16 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable
buf.append(",").append("name=").append(name); buf.append(",").append("name=").append(name);
String basis = buf.toString(); String basis = buf.toString();
Integer count = _unique.get(basis);
count = count == null ? 0 : 1 + count; AtomicInteger count = __unique.get(basis);
_unique.put(basis, count); if (count==null)
{
oname = ObjectName.getInstance(domain + ":" + basis + ",id=" + count); count=__unique.putIfAbsent(basis,new AtomicInteger());
if (count==null)
count=__unique.get(basis);
}
oname = ObjectName.getInstance(domain + ":" + basis + ",id=" + count.getAndIncrement());
} }
ObjectInstance oinstance = _mbeanServer.registerMBean(mbean, oname); ObjectInstance oinstance = _mbeanServer.registerMBean(mbean, oname);

1
jetty-monitor/src/test/java/org/eclipse/jetty/monitor/AttrEventTriggerTest.java
View File

@ -98,6 +98,7 @@ public class AttrEventTriggerTest
_handler = new TestHandler(); _handler = new TestHandler();
_server.setHandler(_handler); _server.setHandler(_handler);
MBeanContainer.resetUnique();
MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
_mBeanContainer = new MBeanContainer(mBeanServer); _mBeanContainer = new MBeanContainer(mBeanServer);
_server.addBean(_mBeanContainer,true); _server.addBean(_mBeanContainer,true);