Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3869: Fix MBeanServer Detection

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3869

When using `@EnableIntegrationMBeanExport` with no `server` property,
the `IntegrationMBeanExportConfiguration` incorrectly created a new
`MBeanServer` instead of attempting to locate an existing one.

Use the `SpecificPlatform` logic from `MBeanExportConfiguration` to locate
a specific server on `WebSphere` and `WebLogic`; otherwise defer to
`JmxUtils.locateMBeanServer()` in the exporter's initialization method.

Add a test to verify the same server is used in multiple contexts.

* Fix `ConnectionFactoryTests` regarding new `MessageProducerSupport` logic
This commit is contained in:
Gary Russell
2016-01-12 13:49:12 -05:00
committed by Artem Bilan
parent 996e6bb969
commit d8ad38d8ea
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
View File

@@ -15,6 +15,7 @@ package org.springframework.integration.monitor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -33,14 +34,18 @@ import org.springframework.aop.framework.Advised;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.Lifecycle;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.context.OrderlyShutdownCapable;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.endpoint.MessageProducerSupport;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.jmx.config.EnableIntegrationMBeanExport;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -224,6 +229,28 @@ public class MBeanExporterIntegrationTests {
assertEquals(2, names.size());
}
@Test
public void testSingleMBeanServer() {
AnnotationConfigApplicationContext ctx1 = new AnnotationConfigApplicationContext(Config1.class);
AnnotationConfigApplicationContext ctx2 = new AnnotationConfigApplicationContext(Config2.class);
assertSame(TestUtils.getPropertyValue(ctx1.getBean(IntegrationMBeanExporter.class), "server"),
TestUtils.getPropertyValue(ctx2.getBean(IntegrationMBeanExporter.class), "server"));
ctx1.close();
ctx2.close();
}
@EnableIntegration
@EnableIntegrationMBeanExport(defaultDomain = "config1")
public static class Config1 {
}
@EnableIntegration
@EnableIntegrationMBeanExport(defaultDomain = "config2")
public static class Config2 {
}
public static class BogusEndpoint extends AbstractEndpoint {
@SuppressWarnings("unused")