svn commit: r524884 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java

[el...@apache.org]

Author: elecharny
Date: Mon Apr  2 11:40:48 2007
New Revision: 524884

URL: http://svn.apache.org/viewvc?view=rev&rev=524884
Log:
Use a threadsafe map instead of synchronizing the methods. It may save some time.

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java?view=diff&rev=524884&r1=524883&r2=524884
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java Mon Apr  2 11:40:48 2007
@@ -21,6 +21,7 @@
 
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,8 +46,11 @@
     // I didn't use ThreadLocal to release contexts explicitly.
     // It seems like JDK 1.5 supports explicit release by introducing
     // <tt>ThreadLocal.remove()</tt>, but we're still targetting 1.4.
-    private static final Map stacks = new IdentityHashMap();
+    private static final Map<Thread, InvocationStack> stacks = 
+        Collections.synchronizedMap( new IdentityHashMap<Thread, InvocationStack>() );
 
+    private final Thread thread;
+    private final List<Invocation> stack = new ArrayList<Invocation>();
 
     /**
      * Returns the invocation stack of current thread.
@@ -55,26 +59,19 @@
     {
         Thread currentThread = Thread.currentThread();
         InvocationStack ctx;
-        synchronized ( stacks )
+        ctx = stacks.get( currentThread );
+
+        if ( ctx == null )
         {
-            ctx = ( InvocationStack ) stacks.get( currentThread );
-            if ( ctx == null )
-            {
-                ctx = new InvocationStack();
-            }
+            ctx = new InvocationStack( currentThread );
         }
+
         return ctx;
     }
 
-    private final Thread thread;
-    private final List stack = new ArrayList();
-
-
-    private InvocationStack()
+    private InvocationStack( Thread currentThread )
     {
-        Thread currentThread = Thread.currentThread();
-        this.thread = currentThread;
-        // This operation is already synchronized from getInstance()
+        thread = currentThread;
         stacks.put( currentThread, this );
     }
 
@@ -86,7 +83,7 @@
     public Invocation[] toArray()
     {
         Invocation[] result = new Invocation[stack.size()];
-        result = ( Invocation[] ) stack.toArray( result );
+        result = stack.toArray( result );
         return result;
     }
 
@@ -96,7 +93,7 @@
      */
     public Invocation peek()
     {
-        return ( Invocation ) this.stack.get( 0 );
+        return stack.get( 0 );
     }
 
 
@@ -105,7 +102,7 @@
      */
     public boolean isEmpty()
     {
-        return this.stack.isEmpty();
+        return stack.isEmpty();
     }
 
 
@@ -114,7 +111,7 @@
      */
     public void push( Invocation invocation )
     {
-        this.stack.add( 0, invocation );
+        stack.add( 0, invocation );
     }
 
 
@@ -124,13 +121,11 @@
      */
     public Invocation pop()
     {
-        Invocation invocation = ( Invocation ) this.stack.remove( 0 );
-        if ( this.stack.size() == 0 )
+        Invocation invocation = stack.remove( 0 );
+        
+        if ( stack.size() == 0 )
         {
-            synchronized ( stacks )
-            {
-                stacks.remove( thread );
-            }
+            stacks.remove( thread );
         }
 
         return invocation;