root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove unnecessary fallback to DefaultConversionService 

See gh-34936
This commit is contained in:
Juergen Hoeller 2025-06-06 09:21:21 +02:00
parent f1ddd051a3
commit d9c103b7ff
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
View File

@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PlaceholderConfigurerSupport; import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
import org.springframework.context.EnvironmentAware; import org.springframework.context.EnvironmentAware;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.ConfigurablePropertyResolver; import org.springframework.core.env.ConfigurablePropertyResolver;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
@ -270,11 +269,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
if (value instanceof String string) { if (value instanceof String string) {
return string; return string;
} }
ConversionService conversionService = super.source.getConversionService(); return super.source.getConversionService().convert(value, String.class);
if (conversionService == null) {
conversionService = DefaultConversionService.getSharedInstance();
}
return conversionService.convert(value, String.class);
} }
@Override @Override