From 16c43dd0d9b4476d95a1a3d68c40bfb45bed2282 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 6 Feb 2018 13:03:44 -0500 Subject: [PATCH] Temporary fix for hikari datasource sealed causing refresh errors. See gh-318 --- .../context/properties/ConfigurationPropertiesRebinder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java index a5350b44..85b7b8c2 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java @@ -96,6 +96,11 @@ public class ConfigurationPropertiesRebinder if (AopUtils.isAopProxy(bean)) { bean = getTargetObject(bean); } + // TODO: determine a more general approach to fix this. + // see https://github.com/spring-cloud/spring-cloud-commons/issues/318 + if (bean.getClass().getName().equals("com.zaxxer.hikari.HikariDataSource")) { + return false; //ignore + } this.applicationContext.getAutowireCapableBeanFactory().destroyBean(bean); this.applicationContext.getAutowireCapableBeanFactory() .initializeBean(bean, name);