Merge branch '1.3.x'

2017-12-15 16:20:56 +00:00
parent 29cb7f3500 8a0261f275
commit 4660ae7d14
1 changed files with 1 additions and 1 deletions
--- 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
@@ -93,7 +93,7 @@ public class ConfigurationPropertiesRebinder
 		if (this.applicationContext != null) {
 			try {
 				Object bean = this.applicationContext.getBean(name);
-				if (AopUtils.isCglibProxy(bean)) {
+				if (AopUtils.isAopProxy(bean)) {
 					bean = getTargetObject(bean);
 				}
 				this.applicationContext.getAutowireCapableBeanFactory().destroyBean(bean);