root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source 
See gh-7718
pull/7737/head
Stephane Nicoll 8 years ago
parent 219e0baa58
commit 3cf54884d8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java
Unescape Escape View File

@ -51,7 +51,7 @@ import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetada
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.config.EnableIntegrationManagement;
import org.springframework.integration.support.management.IntegrationManagementConfigurer; import org.springframework.integration.support.management.IntegrationManagementConfigurer;
/** /**
@ -139,7 +139,7 @@ public class PublicMetricsAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(IntegrationMBeanExporter.class) @ConditionalOnClass(EnableIntegrationManagement.class)
static class IntegrationMetricsConfiguration { static class IntegrationMetricsConfiguration {
@Bean(name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME) @Bean(name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME)

Write Preview
Loading…
Cancel
Save