Synchronize initialization of SimplePropertyValueConversions.

Author: christophstrobl

src/main/java/org/springframework/data/convert/SimplePropertyValueConversions.java

@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.convert.PropertyValueConverterFactories.ChainedPropertyValueConverterFactory;
@@ -40,7 +39,7 @@ public class SimplePropertyValueConversions implements PropertyValueConversions,
 	private @Nullable PropertyValueConverterFactory converterFactory;
 	private @Nullable ValueConverterRegistry<?> valueConverterRegistry;
 	private boolean converterCacheEnabled = true;
-	private final AtomicBoolean initialized = new AtomicBoolean(false);
+	private boolean initialized = false;
 
 	/**
 	 * Set the {@link PropertyValueConverterFactory factory} responsible for creating the actual
@@ -92,7 +91,7 @@ public void setConverterCacheEnabled(boolean converterCacheEnabled) {
 	@Override
 	public boolean hasValueConverter(PersistentProperty<?> property) {
 
-		if (!initialized.get()) {
+		if (!initialized) {
 			init();
 		}
 
@@ -104,7 +103,7 @@ public boolean hasValueConverter(PersistentProperty<?> property) {
 	public <DV, SV, C extends PersistentProperty<C>, D extends ValueConversionContext<C>> PropertyValueConverter<DV, SV, D> getValueConverter(
 			C property) {
 
-		if (!initialized.get()) {
+		if (!initialized) {
 			init();
 		}
 
@@ -114,29 +113,32 @@ public <DV, SV, C extends PersistentProperty<C>, D extends ValueConversionContex
 	/**
 	 * May be called just once to initialize the underlying factory with its values.
 	 */
-	public void init() {
+	public synchronized void init() {
 
-		if (initialized.compareAndSet(false, true)) {
+		if (initialized) {
+			return;
+		}
 
-			List<PropertyValueConverterFactory> factoryList = new ArrayList<>(3);
+		List<PropertyValueConverterFactory> factoryList = new ArrayList<>(3);
 
-			if (converterFactory != null) {
-				factoryList.add(converterFactory);
-			} else {
-				factoryList.add(PropertyValueConverterFactory.simple());
-			}
+		if (converterFactory != null) {
+			factoryList.add(converterFactory);
+		} else {
+			factoryList.add(PropertyValueConverterFactory.simple());
+		}
 
-			if ((valueConverterRegistry != null) && !valueConverterRegistry.isEmpty()) {
-				factoryList.add(PropertyValueConverterFactory.configuredInstance(valueConverterRegistry));
-			}
+		if ((valueConverterRegistry != null) && !valueConverterRegistry.isEmpty()) {
+			factoryList.add(PropertyValueConverterFactory.configuredInstance(valueConverterRegistry));
+		}
 
-			PropertyValueConverterFactory targetFactory = factoryList.size() > 1
-					? PropertyValueConverterFactory.chained(factoryList)
-					: factoryList.iterator().next();
+		PropertyValueConverterFactory targetFactory = factoryList.size() > 1
+				? PropertyValueConverterFactory.chained(factoryList)
+				: factoryList.iterator().next();
 
-			this.converterFactory = converterCacheEnabled ? PropertyValueConverterFactory.caching(targetFactory)
-					: targetFactory;
-		}
+		this.converterFactory = converterCacheEnabled ? PropertyValueConverterFactory.caching(targetFactory)
+				: targetFactory;
+
+		initialized = true;
 	}
 
 	@Override