svn commit: r1770264 - /turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java

[tv]

Author: tv
Date: Thu Nov 17 19:31:00 2016
New Revision: 1770264

URL: http://svn.apache.org/viewvc?rev=1770264&view=rev
Log:
Get rid of lock

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1770264&r1=1770263&r2=1770264&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
 Thu Nov 17 19:31:00 2016
@@ -26,7 +26,6 @@ import java.lang.reflect.Field;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.StringUtils;
@@ -54,9 +53,6 @@ public class AnnotationProcessor
     /** Annotation cache */
     private static ConcurrentMap<String, Annotation[]> annotationCache = new 
ConcurrentHashMap<String, Annotation[]>();
 
-    /** Lock for initialization of cache entry */
-    private static ReentrantLock lock = new ReentrantLock();
-
     /**
      * Search for annotated fields of the object and provide them with the
      * appropriate TurbineService
@@ -81,22 +77,11 @@ public class AnnotationProcessor
                 Annotation[] annotations = annotationCache.get(key);
                 if (annotations == null)
                 {
-                    lock.lock();
-
-                    try
-                    {
-                        // Double check
-                        annotations = annotationCache.get(key);
-
-                        if (annotations == null)
-                        {
-                            annotations = field.getDeclaredAnnotations();
-                            annotationCache.put(key, annotations);
-                        }
-                    }
-                    finally
+                    Annotation[] newAnnotations = 
field.getDeclaredAnnotations();
+                    annotations = annotationCache.putIfAbsent(key, 
newAnnotations);
+                    if (annotations == null)
                     {
-                        lock.unlock();
+                        annotations = newAnnotations;
                     }
                 }