|
|
|
@ -894,8 +894,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader |
|
|
|
beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class)); |
|
|
|
beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Register a default embedded value resolver if no bean post-processor
|
|
|
|
// Register a default embedded value resolver if no BeanFactoryPostProcessor
|
|
|
|
// (such as a PropertyPlaceholderConfigurer bean) registered any before:
|
|
|
|
// (such as a PropertySourcesPlaceholderConfigurer bean) registered any before:
|
|
|
|
// at this point, primarily for resolution in annotation attribute values.
|
|
|
|
// at this point, primarily for resolution in annotation attribute values.
|
|
|
|
if (!beanFactory.hasEmbeddedValueResolver()) { |
|
|
|
if (!beanFactory.hasEmbeddedValueResolver()) { |
|
|
|
beanFactory.addEmbeddedValueResolver(strVal -> getEnvironment().resolvePlaceholders(strVal)); |
|
|
|
beanFactory.addEmbeddedValueResolver(strVal -> getEnvironment().resolvePlaceholders(strVal)); |
|
|
|
|