svn commit: r1855459 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java

[cbrisson]

Author: cbrisson
Date: Wed Mar 13 23:12:33 2019
New Revision: 1855459

URL: http://svn.apache.org/viewvc?rev=1855459&view=rev
Log:
[tools/generic] No need for last commit, it's been taken care of upstream

Modified:
    
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java

Modified: 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java?rev=1855459&r1=1855458&r2=1855459&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
 Wed Mar 13 23:12:33 2019
@@ -26,7 +26,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * <p>Implements common logic and constants for tools which automatically
@@ -77,7 +76,7 @@ public class SafeConfig
      */
     public static final String USE_CLASS_LOGGER_KEY = "useClassLogger";
 
-    private AtomicBoolean configLocked = new AtomicBoolean(false);
+    private boolean configLocked = false;
     private boolean safeMode = false;
 
     protected Logger log = null;
@@ -88,7 +87,7 @@ public class SafeConfig
      */
     protected void setLockConfig(boolean lock)
     {
-        this.configLocked.set(lock);
+        this.configLocked = lock;
     }
 
     /**
@@ -107,7 +106,7 @@ public class SafeConfig
      */
     public boolean isConfigLocked()
     {
-        return this.configLocked.get();
+        return this.configLocked;
     }
 
     /**
@@ -135,25 +134,19 @@ public class SafeConfig
     {
         if (!isConfigLocked())
         {
-            synchronized (this)
-            {
-                if (!isConfigLocked())
-                {
-                    ValueParser values = new ValueParser(params);
-
-                    // set up logger
-                    initLogger(values);
-
-                    // call configure
-                    configure(values);
-
-                    setSafeMode(values.getBoolean(SAFE_MODE_KEY, true));
-
-                    // check under the new key
-                    Boolean lock = values.getBoolean(LOCK_CONFIG_KEY, 
Boolean.TRUE);
-                    setLockConfig(lock.booleanValue());
-                }
-            }
+            ValueParser values = new ValueParser(params);
+
+            // set up logger
+            initLogger(values);
+
+            // call configure
+            configure(values);
+
+            setSafeMode(values.getBoolean(SAFE_MODE_KEY, true));
+
+            // check under the new key
+            Boolean lock = values.getBoolean(LOCK_CONFIG_KEY, Boolean.TRUE);
+            setLockConfig(lock.booleanValue());
         }
     }