Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit 9cb4de8)
This commit is contained in:
Juergen Hoeller
2016-12-20 21:11:07 +01:00
parent 154ef8bf10
commit 82c1c859d9
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java vendored
View File

@@ -248,16 +248,16 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
if (targetType == null) {
return (T) value;
}
ConversionService csToUse = this.conversionService;
if (csToUse == null) {
ConversionService conversionServiceToUse = this.conversionService;
if (conversionServiceToUse == null) {
// Avoid initialization of shared DefaultConversionService if
// no standard type conversion is needed in the first place...
if (ClassUtils.isAssignableValue(targetType, value)) {
return (T) value;
}
csToUse = DefaultConversionService.getSharedInstance();
conversionServiceToUse = DefaultConversionService.getSharedInstance();
}
return csToUse.convert(value, targetType);
return conversionServiceToUse.convert(value, targetType);
}