Skip to content

Commit d9c103b

Browse files
committed
Remove unnecessary fallback to DefaultConversionService
See gh-34936
1 parent f1ddd05 commit d9c103b

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
2626
import org.springframework.context.EnvironmentAware;
2727
import org.springframework.core.convert.ConversionService;
28-
import org.springframework.core.convert.support.DefaultConversionService;
2928
import org.springframework.core.env.ConfigurableEnvironment;
3029
import org.springframework.core.env.ConfigurablePropertyResolver;
3130
import org.springframework.core.env.Environment;
@@ -270,11 +269,7 @@ private String convertToString(Object value) {
270269
if (value instanceof String string) {
271270
return string;
272271
}
273-
ConversionService conversionService = super.source.getConversionService();
274-
if (conversionService == null) {
275-
conversionService = DefaultConversionService.getSharedInstance();
276-
}
277-
return conversionService.convert(value, String.class);
272+
return super.source.getConversionService().convert(value, String.class);
278273
}
279274

280275
@Override

0 commit comments

Comments
 (0)