Author: darran.lofthouse(a)jboss.com Date: 2009-03-20 12:23:35 -0400 (Fri, 20 Mar 2009) New Revision: 9640 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java Log: [JBPAPP-1784] WS throws NPE when started with -Dcom.sun.management.jmxremote Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-03-20 15:12:37 UTC (rev 9639) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-03-20 16:23:35 UTC (rev 9640) @@ -605,11 +605,16 @@ private MBeanServer getJMXServer() { MBeanServer server = null; - ArrayList servers = MBeanServerFactory.findMBeanServer(null); - if (servers.size() > 0) + ArrayList<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null); + for (MBeanServer current : servers) { - server = (MBeanServer)servers.get(0); + if (current.getClass().getName().startsWith("org.jboss")) // JBWS-2580 + { + server = current; + break; + } } + return server; }