Skip to content

S
spring-boot
Commit 43c07e8b authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Protect against duplicate datasource MBeans 

See gh-1590
parent a973fd41
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @ 43c07e8b
...@@ -148,6 +148,7 @@ public class DataSourceAutoConfiguration { ...@@ -148,6 +148,7 @@ public class DataSourceAutoConfiguration {
@ConditionalOnProperty(prefix = "spring.datasource", name = "jmx-enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.datasource", name = "jmx-enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnClass(name = "org.apache.tomcat.jdbc.pool.DataSourceProxy") @ConditionalOnClass(name = "org.apache.tomcat.jdbc.pool.DataSourceProxy")
@Conditional(DataSourceAutoConfiguration.DataSourceAvailableCondition.class) @Conditional(DataSourceAutoConfiguration.DataSourceAvailableCondition.class)
@ConditionalOnMissingBean(name = "dataSourceMBean")
protected static class TomcatDataSourceJmxConfiguration { protected static class TomcatDataSourceJmxConfiguration {
@Bean @Bean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment