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

StandardTypeConverter initializes default ConversionService against volatile field 

Issue: SPR-14465
(cherry picked from commit 0065a16)
This commit is contained in:
Juergen Hoeller 2016-07-14 21:10:24 +02:00
parent c627c408a0
commit 97d73eb70c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,7 +36,7 @@ import org.springframework.util.Assert;
*/ */
public class StandardTypeConverter implements TypeConverter { public class StandardTypeConverter implements TypeConverter {
private static ConversionService defaultConversionService; private static volatile ConversionService defaultConversionService;
private final ConversionService conversionService; private final ConversionService conversionService;
@ -45,10 +45,8 @@ public class StandardTypeConverter implements TypeConverter {
* Create a StandardTypeConverter for the default ConversionService. * Create a StandardTypeConverter for the default ConversionService.
*/ */
public StandardTypeConverter() { public StandardTypeConverter() {
synchronized (this) { if (defaultConversionService == null) {
if (defaultConversionService == null) { defaultConversionService = new DefaultConversionService();
defaultConversionService = new DefaultConversionService();
}
} }
this.conversionService = defaultConversionService; this.conversionService = defaultConversionService;
} }