GTNPORTAL-3094 Broken Double-Checked Lock in CodecInitializer

gatein · Jun 3, 2013 · dc949d4 · dc949d4
1 parent 5940ad7
commit dc949d4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...onent/web/security/src/main/java/org/exoplatform/web/security/codec/CodecInitializer.java b/...onent/web/security/src/main/java/org/exoplatform/web/security/codec/CodecInitializer.java
@@ -58,7 +58,7 @@ public class CodecInitializer {
 
     private final String confDir;
 
-    private AbstractCodec codec;
+    private volatile AbstractCodec codec;
 
     public CodecInitializer(InitParams initParams) {
         ValueParam gateinConfParam = initParams.getValueParam("gatein.conf.dir");
@@ -71,14 +71,16 @@ public CodecInitializer(InitParams initParams) {
      * @throws TokenServiceInitializationException if some error happen during codec initialization
      */
     public AbstractCodec getCodec() throws TokenServiceInitializationException {
-        if (codec == null) {
+        AbstractCodec helper = codec;
+        if (helper == null) {
             synchronized(this) {
-                if (codec == null) {
-                    codec = initCodec();
+                helper = codec;
+                if (helper == null) {
+                    this.codec = helper = initCodec();
                 }
             }
         }
-        return codec;
+        return helper;
     }