MBeanServerFactoryBean returns JDK 1.5 platform MBeanServer for agent id "" (SPR-5909)
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
/*
|
||||
* Copyright 2002-2005 the original author or authors.
|
||||
* Copyright 2002-2009 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||
* use this file except in compliance with the License. You may obtain a copy of
|
||||
* the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
@@ -17,7 +17,7 @@
|
||||
package org.springframework.jmx.support;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import java.lang.management.ManagementFactory;
|
||||
import javax.management.MBeanServer;
|
||||
import javax.management.MBeanServerFactory;
|
||||
|
||||
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
|
||||
|
||||
/**
|
||||
* @author Rob Harrop
|
||||
* @author Juergen Hoeller
|
||||
*/
|
||||
public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
|
||||
@@ -32,7 +33,7 @@ public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
|
||||
bean.afterPropertiesSet();
|
||||
try {
|
||||
MBeanServer server = (MBeanServer) bean.getObject();
|
||||
MBeanServer server = bean.getObject();
|
||||
assertNotNull("The MBeanServer should not be null", server);
|
||||
}
|
||||
finally {
|
||||
@@ -45,7 +46,7 @@ public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
bean.setDefaultDomain("foo");
|
||||
bean.afterPropertiesSet();
|
||||
try {
|
||||
MBeanServer server = (MBeanServer) bean.getObject();
|
||||
MBeanServer server = bean.getObject();
|
||||
assertEquals("The default domain should be foo", "foo", server.getDefaultDomain());
|
||||
}
|
||||
finally {
|
||||
@@ -60,7 +61,7 @@ public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
bean.setLocateExistingServerIfPossible(true);
|
||||
bean.afterPropertiesSet();
|
||||
try {
|
||||
MBeanServer otherServer = (MBeanServer) bean.getObject();
|
||||
MBeanServer otherServer = bean.getObject();
|
||||
assertSame("Existing MBeanServer not located", server, otherServer);
|
||||
}
|
||||
finally {
|
||||
@@ -72,12 +73,24 @@ public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
}
|
||||
}
|
||||
|
||||
public void testWithLocateExistingAndNoExistingServer() {
|
||||
public void testWithLocateExistingAndFallbackToPlatformServer() {
|
||||
MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
|
||||
bean.setLocateExistingServerIfPossible(true);
|
||||
bean.afterPropertiesSet();
|
||||
try {
|
||||
assertNotNull("MBeanServer not created", bean.getObject());
|
||||
assertSame(ManagementFactory.getPlatformMBeanServer(), bean.getObject());
|
||||
}
|
||||
finally {
|
||||
bean.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
public void testWithEmptyAgentIdAndFallbackToPlatformServer() {
|
||||
MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
|
||||
bean.setAgentId("");
|
||||
bean.afterPropertiesSet();
|
||||
try {
|
||||
assertSame(ManagementFactory.getPlatformMBeanServer(), bean.getObject());
|
||||
}
|
||||
finally {
|
||||
bean.destroy();
|
||||
@@ -98,12 +111,12 @@ public class MBeanServerFactoryBeanTests extends TestCase {
|
||||
bean.afterPropertiesSet();
|
||||
|
||||
try {
|
||||
MBeanServer server = (MBeanServer) bean.getObject();
|
||||
List servers = MBeanServerFactory.findMBeanServer(null);
|
||||
MBeanServer server = bean.getObject();
|
||||
List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
|
||||
|
||||
boolean found = false;
|
||||
for (int x = 0; x < servers.size(); x++) {
|
||||
if (servers.get(x) == server) {
|
||||
for (MBeanServer candidate : servers) {
|
||||
if (candidate == server) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user