Stop DataSource initialization from preventing Hikari instrumentation

Closes gh-12129
2018-02-21 10:27:13 +00:00
parent 33be78a91e
commit e7176c63f5
3 changed files with 81 additions and 6 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerPostProcessor.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerPostProcessor.java
@@ -33,11 +33,9 @@ import org.springframework.core.Ordered;
 */
 class DataSourceInitializerPostProcessor implements BeanPostProcessor, Ordered {

-	private int order = Ordered.HIGHEST_PRECEDENCE;
-
 	@Override
 	public int getOrder() {
-		return this.order;
+		return Ordered.HIGHEST_PRECEDENCE + 1;
 	}

 	@Autowired