Protect against duplicate datasource MBeans

See gh-1590
2014-11-03 17:43:53 -08:00 · 2014-11-03 17:43:53 -08:00 · 43c07e8b44
parent a973fd41f4
commit 43c07e8b44
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@ -148,6 +148,7 @@ public class DataSourceAutoConfiguration {
 	@ConditionalOnProperty(prefix = "spring.datasource", name = "jmx-enabled", havingValue = "true", matchIfMissing = true)
 	@ConditionalOnClass(name = "org.apache.tomcat.jdbc.pool.DataSourceProxy")
 	@Conditional(DataSourceAutoConfiguration.DataSourceAvailableCondition.class)
+	@ConditionalOnMissingBean(name = "dataSourceMBean")
 	protected static class TomcatDataSourceJmxConfiguration {

 		@Bean