Attachment 681330 Details for Bug 899291 – syncmap.diff

syncmap.diff

syncmap.diff (text/x-patch), 1.59 KB, created by Radoslav Husar on 2010-08-03 16:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radoslav Husar

Created: 2010-08-03 16:53:17 UTC

Size: 1.59 KB

patch

obsolete

>Index: jnpserver/src/main/java/org/jboss/naming/ENCFactory.java
>===================================================================
>--- jnpserver/src/main/java/org/jboss/naming/ENCFactory.java	(revision 107349)
>+++ jnpserver/src/main/java/org/jboss/naming/ENCFactory.java	(working copy)
>@@ -23,8 +23,10 @@
> 
> import java.security.AccessController;
> import java.security.PrivilegedAction;
>+import java.util.Collections;
> import java.util.Hashtable;
> import java.util.List;
>+import java.util.Map;
> import java.util.WeakHashMap;
> import java.util.concurrent.ConcurrentHashMap;
> import javax.naming.Context;
>@@ -50,7 +52,7 @@
>    // Constants -----------------------------------------------------
>     
>    // Attributes ----------------------------------------------------
>-   private static WeakHashMap classloaderKeyedEncs = new WeakHashMap();
>+   private static Map classloaderKeyedEncs = Collections.synchronizedMap(new WeakHashMap());
>    private static ClassLoader topLoader;
>    private static ThreadLocalStack<Object> encIdStack = new ThreadLocalStack<Object>();
>    private static ConcurrentHashMap<Object, Context> encById = new ConcurrentHashMap<Object, Context>();
>@@ -111,8 +113,6 @@
>       }
>       // Get naming for this component
>       ClassLoader ctxClassLoader = GetTCLAction.getContextClassLoader();
>-      synchronized (classloaderKeyedEncs)
>-      {
>          Context compCtx = (Context) classloaderKeyedEncs.get(ctxClassLoader);
> 
>          /* If this is the first time we see ctxClassLoader first check to see
>@@ -135,7 +135,6 @@
>             }
>          }
>          return compCtx;
>-      }
>    }
> 
>    /**

Actions: View

Attachments on bug 899291: 681328 | 681329 | 681330