add initialized

drtrang · Mar 21, 2018 · 50ed14d · 50ed14d
1 parent 07ec428
commit 50ed14d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.drtrang</groupId>
     <artifactId>copiers</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1-SNAPSHOT</version>
 
     <name>Copiers</name>
     <description>A Friendly Bean Copier Packaging.</description>

diff --git a/src/main/java/com/github/trang/copiers/orika/OrikaMapper.java b/src/main/java/com/github/trang/copiers/orika/OrikaMapper.java
@@ -27,7 +27,8 @@ public class OrikaMapper {
     /** 启用 Boolean Converter 时使用的分隔符，默认 "," */
     private String delimiter = defaultDelimiter;
     /** Orika MapperFactory */
-    private DefaultMapperFactory factory;
+    private volatile DefaultMapperFactory factory;
+    private volatile boolean initialized = false;
 
     public OrikaMapper() {
         this(defaultUseBuiltinBooleanConverters, defaultUseBuiltinListConverters, defaultDelimiter);
@@ -45,11 +46,14 @@ public static OrikaMapper.Builder builder() {
     }
 
     private synchronized void init() {
-        DefaultMapperFactory.Builder factoryBuilder = new DefaultMapperFactory.Builder();
-        configureFactoryBuilder(factoryBuilder);
-        this.factory = factoryBuilder.build();
-        configure(this.factory);
-        registerConverters(this.factory.getConverterFactory());
+        if (!initialized) {
+            DefaultMapperFactory.Builder factoryBuilder = new DefaultMapperFactory.Builder();
+            configureFactoryBuilder(factoryBuilder);
+            this.factory = factoryBuilder.build();
+            configure(this.factory);
+            registerConverters(this.factory.getConverterFactory());
+            initialized = true;
+        }
     }
 
     protected void configureFactoryBuilder(DefaultMapperFactory.Builder factoryBuilder) {}