Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
|
ce41f4d407 | |
|
bede11a7e2 | |
|
9388aa7f65 |
|
@ -406,8 +406,10 @@ public abstract class AbstractAnnotationBeanPostProcessor implements Instantiati
|
||||||
|
|
||||||
if (injectedObject == null) {
|
if (injectedObject == null) {
|
||||||
injectedObject = doGetInjectedBean(attributes, bean, beanName, injectedType, injectedElement);
|
injectedObject = doGetInjectedBean(attributes, bean, beanName, injectedType, injectedElement);
|
||||||
// Customized inject-object if necessary
|
if (injectedObject != null) {
|
||||||
injectedObjectsCache.putIfAbsent(cacheKey, injectedObject);
|
// Customized inject-object if necessary
|
||||||
|
injectedObjectsCache.putIfAbsent(cacheKey, injectedObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return injectedObject;
|
return injectedObject;
|
||||||
|
@ -639,4 +641,4 @@ public abstract class AbstractAnnotationBeanPostProcessor implements Instantiati
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,10 +18,10 @@
|
||||||
package com.alibaba.nacos.spring.context.annotation.config;
|
package com.alibaba.nacos.spring.context.annotation.config;
|
||||||
|
|
||||||
import com.alibaba.nacos.common.utils.MD5Utils;
|
import com.alibaba.nacos.common.utils.MD5Utils;
|
||||||
|
import com.alibaba.nacos.spring.beans.factory.annotation.AbstractAnnotationBeanPostProcessor;
|
||||||
import com.alibaba.nacos.spring.context.event.config.NacosConfigReceivedEvent;
|
import com.alibaba.nacos.spring.context.event.config.NacosConfigReceivedEvent;
|
||||||
import com.alibaba.nacos.spring.util.NacosUtils;
|
import com.alibaba.nacos.spring.util.NacosUtils;
|
||||||
import com.alibaba.nacos.spring.util.PlaceholderHelper;
|
import com.alibaba.nacos.spring.util.PlaceholderHelper;
|
||||||
import com.alibaba.spring.beans.factory.annotation.AbstractAnnotationBeanPostProcessor;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -74,7 +74,7 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>2.1.1-RC</revision>
|
<revision>2.1.1</revision>
|
||||||
<argLine>-Dfile.encoding=UTF-8</argLine>
|
<argLine>-Dfile.encoding=UTF-8</argLine>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
|
Loading…
Reference in New Issue